[496466] Add test on copy/paste format, layout and style.

* Complete existing tests for copy/paste layout * Add tests for copy/paste style and copy/paste format Bug: 496466 Change-Id: I08f543ead6b620af330bed046468266307c2a3ba Signed-off-by: Jessy Mallet <jessy.mallet@obeo.fr>
author: Jessy Mallet 2016-06-28 14:07:36 +0000
committer: Laurent Redor 2016-07-08 11:19:02 +0000
commit: 0019649cfd90381e34c632ddb8ced43eb0d69b4b (patch)
tree: 4610c08375bb55e3971ffa31ae9cd52cc57ba24a
parent: cbdf959ee962aecbe4f56c6142a37705c2af0522 (diff)
download: org.eclipse.sirius-0019649cfd90381e34c632ddb8ced43eb0d69b4b.tar.gz
org.eclipse.sirius-0019649cfd90381e34c632ddb8ced43eb0d69b4b.tar.xz
org.eclipse.sirius-0019649cfd90381e34c632ddb8ced43eb0d69b4b.zip
21 files changed, 5386 insertions, 4398 deletions
diff --git a/plugins/org.eclipse.sirius.tests.junit/plugin.xml b/plugins/org.eclipse.sirius.tests.junit/plugin.xml
index 7f724c4223..2fbf2e376a 100644
--- a/plugins/org.eclipse.sirius.tests.junit/plugin.xml
+++ b/plugins/org.eclipse.sirius.tests.junit/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
 <!--
-  Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
+  Copyright (c) 2010, 2016 THALES GLOBAL SERVICES
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
   which accompanies this distribution, and is available at
@@ -77,5 +77,9 @@
             class="org.eclipse.sirius.tests.unit.diagram.layout.data.manager.extension.SampleDataProvider"
             id="sampleDataProvider">
       </layoutDataManagerProvider>
+      <layoutDataManagerProvider
+            class="org.eclipse.sirius.tests.unit.diagram.layout.data.manager.extension.SampleNameDataProvider"
+            id="sampleNameDataProvider">
+      </layoutDataManagerProvider>
    </extension>
 </plugin>
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/layout/data/manager/extension/LayoutDataManagerSelectionTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/layout/data/manager/extension/LayoutDataManagerSelectionTest.java
index c436adf45d..80ce3e18cb 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/layout/data/manager/extension/LayoutDataManagerSelectionTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/layout/data/manager/extension/LayoutDataManagerSelectionTest.java
@@ -35,8 +35,8 @@ public class LayoutDataManagerSelectionTest extends TestCase {
      * Test sample extension presence and deployment.
      */
     public void testSampleExtensionDeployment() {
-        assertEquals("Sample layout data manager extension not found.", 1, LayoutDataManagerRegistry.getRegisteredExtensions().size());
-        assertEquals("Sample layout data manager extension instance not found.", 2, LayoutDataManagerRegistry.getAllSiriusLayoutDataManagers().size());
+        assertEquals("Sample layout data manager extension not found.", 2, LayoutDataManagerRegistry.getRegisteredExtensions().size());
+        assertEquals("Sample layout data manager extension instance not found.", 3, LayoutDataManagerRegistry.getAllSiriusLayoutDataManagers().size());
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/layout/data/manager/extension/SampleManager.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/layout/data/manager/extension/SampleManager.java
index 2d4a95ae55..3c2b313718 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/layout/data/manager/extension/SampleManager.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/layout/data/manager/extension/SampleManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -66,6 +66,7 @@ public class SampleManager extends AbstractSiriusLayoutDataManager implements Si
     /**
      * {@inheritDoc}
      */
+    @Override
     public AbstractLayoutData getLayoutData(LayoutDataKey key) {
         if (key instanceof AbstractSampleLayouDataKey && validateKey((AbstractSampleLayouDataKey) key)) {
             return getLinkedLayoutData((AbstractSampleLayouDataKey) key);
@@ -75,15 +76,15 @@ public class SampleManager extends AbstractSiriusLayoutDataManager implements Si
     }
 
     private AbstractLayoutData getLinkedLayoutData(AbstractSampleLayouDataKey key) {
-        AbstractLayoutData layoutData = layoutDataMap.get(key);
+        AbstractLayoutData layoutData = null;
         if (layoutData == null) {
             // Retrieve traceability/refinement information
             EObject foundSemantic = retrieveLinkedEObject(key.getSemantic());
             if (foundSemantic != null) {
                 if (key instanceof SampleNodeLayouDataKey) {
-                    layoutData = getLinkedLayoutData(new SampleNodeLayouDataKey(foundSemantic));
+                    layoutData = layoutDataMap.get(new SampleNodeLayouDataKey(foundSemantic));
                 } else if (key instanceof SampleEdgeLayouDataKey) {
-                    layoutData = getLinkedLayoutData(new SampleEdgeLayouDataKey(foundSemantic));
+                    layoutData = layoutDataMap.get(new SampleEdgeLayouDataKey(foundSemantic));
                 }
             }
         }
@@ -108,6 +109,7 @@ public class SampleManager extends AbstractSiriusLayoutDataManager implements Si
     /**
      * {@inheritDoc}
      */
+    @Override
     public LayoutDataKey createKey(DSemanticDecorator semanticDecorator) {
         LayoutDataKey result = null;
         final EObject realSemanticElement = semanticDecorator.getTarget();
@@ -123,6 +125,7 @@ public class SampleManager extends AbstractSiriusLayoutDataManager implements Si
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addLayoutData(LayoutDataKey key, AbstractLayoutData layoutData) {
         if (key instanceof AbstractSampleLayouDataKey && validateKey((AbstractSampleLayouDataKey) key)) {
             layoutDataMap.put((AbstractSampleLayouDataKey) key, layoutData);
@@ -132,6 +135,7 @@ public class SampleManager extends AbstractSiriusLayoutDataManager implements Si
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean containsData() {
         return !layoutDataMap.isEmpty();
     }
@@ -139,6 +143,7 @@ public class SampleManager extends AbstractSiriusLayoutDataManager implements Si
     /**
      * {@inheritDoc}
      */
+    @Override
     public void clearLayoutData() {
         layoutDataMap.clear();
     }
@@ -166,10 +171,12 @@ public class SampleManager extends AbstractSiriusLayoutDataManager implements Si
      */
     private class SampleSessionManagerListener implements SessionManagerListener {
 
+        @Override
         public void notifyRemoveSession(Session removedSession) {
             cleanCache();
         }
 
+        @Override
         public void notify(Session updated, int notification) {
             switch (notification) {
             case SessionListener.CLOSED:
@@ -186,14 +193,17 @@ public class SampleManager extends AbstractSiriusLayoutDataManager implements Si
             }
         }
 
+        @Override
         public void notifyAddSession(Session newSession) {
             // Nothing to do
         }
 
+        @Override
         public void viewpointSelected(Viewpoint selectedSirius) {
             // Nothing to do
         }
 
+        @Override
         public void viewpointDeselected(Viewpoint deselectedSirius) {
             // Nothing to do
 
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/layout/data/manager/extension/SampleNameDataProvider.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/layout/data/manager/extension/SampleNameDataProvider.java
new file mode 100644
index 0000000000..cffb486c22
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/layout/data/manager/extension/SampleNameDataProvider.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2016 THALES GLOBAL SERVICES.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.tests.unit.diagram.layout.data.manager.extension;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.diagram.DDiagram;
+import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.ui.tools.api.layout.ILayoutDataManagerProvider;
+import org.eclipse.sirius.diagram.ui.tools.api.layout.SiriusLayoutDataManager;
+
+/**
+ * Sample extension provider.
+ * 
+ * @author jmallet
+ * 
+ */
+public class SampleNameDataProvider implements ILayoutDataManagerProvider {
+
+    private static final String EXPECTED_SUFFIX = "AdaptedForCopyPasteFormatTest";
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean provides(DDiagram diagram) {
+        if (diagram instanceof DSemanticDiagram) {
+            DSemanticDiagram dSem = (DSemanticDiagram) diagram;
+            EObject semanticTarget = dSem.getTarget();
+            return semanticTarget instanceof EModelElement && diagram.getName().endsWith(EXPECTED_SUFFIX);
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public SiriusLayoutDataManager getLayoutDataManager() {
+        return new SampleManager();
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/uml2.aird b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/uml2.aird
index f2ba2d6455..5e42375905 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/uml2.aird
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/uml2.aird
@@ -1,7 +1,8 @@
 <?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:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" 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:uml="http://www.eclipse.org/uml2/4.0.0/UML" 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/filter/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/filter http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style" xmi:id="_DKJToM31Ed6I_ZSkQ7u_fA" selectedViews="_DbmQAM31Ed6I_ZSkQ7u_fA" version="8.1.1">
-  <models xmi:type="uml:Model" href="uml2.uml#_Wh_KkEjgEd2dA-w4B9F6fQ"/>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_DbmQAM31Ed6I_ZSkQ7u_fA" initialized="true">
+<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:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" 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:uml="http://www.eclipse.org/uml2/5.0.0/UML" 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/filter/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/filter http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style" xmi:id="_DKJToM31Ed6I_ZSkQ7u_fA" selectedViews="_DbmQAM31Ed6I_ZSkQ7u_fA" version="11.0.0.201604141600">
+  <semanticResources>uml2.uml</semanticResources>
+  <ownedViews xmi:type="viewpoint:DView" xmi:id="_DbmQAM31Ed6I_ZSkQ7u_fA">
+    <viewpoint xmi:type="description:Viewpoint" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']"/>
     <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_Dbrvkc31Ed6I_ZSkQ7u_fA" name="DnD Class Diagram">
       <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_O5ITUBHoEeK-xJ8W7doAqA" source="GMF_DIAGRAMS">
         <data xmi:type="notation:Diagram" xmi:id="_FJjmoM31Ed6I_ZSkQ7u_fA" type="Sirius" element="_Dbrvkc31Ed6I_ZSkQ7u_fA" measurementUnit="Pixel">
@@ -192,20 +193,35 @@
             <styles xmi:type="notation:FontStyle" xmi:id="_FLIT8s31Ed6I_ZSkQ7u_fA" fontName="Comic Sans MS" fontHeight="8"/>
             <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FLIT8831Ed6I_ZSkQ7u_fA" points="[56, 5, -95, -11]$[110, 11, -41, -5]"/>
           </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_8qtX8ENXEea_NvY-zhbnXg" type="4001" element="_8qjm8ENXEea_NvY-zhbnXg" source="_FKzj0M31Ed6I_ZSkQ7u_fA" target="_FLBmQM31Ed6I_ZSkQ7u_fA">
+            <children xmi:type="notation:Node" xmi:id="_8qtX9ENXEea_NvY-zhbnXg" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8qtX9UNXEea_NvY-zhbnXg" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_8qtX9kNXEea_NvY-zhbnXg" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8qtX90NXEea_NvY-zhbnXg" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_8qtX-ENXEea_NvY-zhbnXg" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8qtX-UNXEea_NvY-zhbnXg" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_8qtX8UNXEea_NvY-zhbnXg"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_8qtX8kNXEea_NvY-zhbnXg" fontName="Segoe UI"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8qtX80NXEea_NvY-zhbnXg" points="[251, 111, 251, 111]$[420, 122, 420, 122]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8qtX-kNXEea_NvY-zhbnXg" id="(0.5,0.5)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8qtX-0NXEea_NvY-zhbnXg" id="(0.5,0.5)"/>
+          </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8SuVwENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8SuVwUNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4gpQEJjJEeCGbO5oLE72PQ" name="RootPackage1">
         <target xmi:type="uml:Package" href="uml2.uml#_05Rt4MlFEd6R3_bpV99jfA"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_05Rt4MlFEd6R3_bpV99jfA"/>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4gp3IJjJEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4gp3IZjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4gp3IJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4gp3IpjJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4gp3I5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4gp3JJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_4gzBEJjJEeCGbO5oLE72PQ" name="InClass1" incomingEdges="_4hGjEZjJEeCGbO5oLE72PQ">
@@ -214,72 +230,48 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4gzoIJjJEeCGbO5oLE72PQ" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4gzoIZjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4gzoIJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4gzoIpjJEeCGbO5oLE72PQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4gzoI5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4gzoJJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']"/>
         </ownedDiagramElements>
         <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_4g0PMJjJEeCGbO5oLE72PQ" name="InClass3" incomingEdges="_4hF8AJjJEeCGbO5oLE72PQ">
           <target xmi:type="uml:Class" href="uml2.uml#_BXnocMlHEd6R3_bpV99jfA"/>
           <semanticElements xmi:type="uml:Class" href="uml2.uml#_BXnocMlHEd6R3_bpV99jfA"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4g02QJjJEeCGbO5oLE72PQ" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4g02QZjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4g02QJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4g02QpjJEeCGbO5oLE72PQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4g02Q5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4g02RJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']"/>
         </ownedDiagramElements>
         <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_4g02RZjJEeCGbO5oLE72PQ" name="InAndOutClass4" outgoingEdges="_4hF8AJjJEeCGbO5oLE72PQ">
           <target xmi:type="uml:Class" href="uml2.uml#_KfsAMMlHEd6R3_bpV99jfA"/>
           <semanticElements xmi:type="uml:Class" href="uml2.uml#_KfsAMMlHEd6R3_bpV99jfA"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4g1dUJjJEeCGbO5oLE72PQ" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4g1dUZjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4g1dUJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4g1dUpjJEeCGbO5oLE72PQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4g1dU5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4g1dVJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']"/>
         </ownedDiagramElements>
         <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_4g2EYJjJEeCGbO5oLE72PQ" name="OutClass1" outgoingEdges="_4hGjEZjJEeCGbO5oLE72PQ">
           <target xmi:type="uml:Class" href="uml2.uml#_5eqkoMlFEd6R3_bpV99jfA"/>
           <semanticElements xmi:type="uml:Class" href="uml2.uml#_5eqkoMlFEd6R3_bpV99jfA"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4g2rcJjJEeCGbO5oLE72PQ" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4g2rcZjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4g2rcJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4g2rcpjJEeCGbO5oLE72PQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4g2rc5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4g2rdJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']"/>
         </ownedDiagramElements>
         <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_4g2rdZjJEeCGbO5oLE72PQ" name="InClass2" incomingEdges="_4hHKIJjJEeCGbO5oLE72PQ">
           <target xmi:type="uml:Class" href="uml2.uml#_BwB94MlGEd6R3_bpV99jfA"/>
           <semanticElements xmi:type="uml:Class" href="uml2.uml#_BwB94MlGEd6R3_bpV99jfA"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4g3SgJjJEeCGbO5oLE72PQ" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4g3SgZjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4g3SgJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4g3SgpjJEeCGbO5oLE72PQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4g3Sg5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4g3ShJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']"/>
         </ownedDiagramElements>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4g6V0JjJEeCGbO5oLE72PQ" name="ContainerPackageToDrop">
           <target xmi:type="uml:Package" href="uml2.uml#_0KL4oMlYEd6fBP-DQJTG8g"/>
           <semanticElements xmi:type="uml:Package" href="uml2.uml#_0KL4oMlYEd6fBP-DQJTG8g"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4g684JjJEeCGbO5oLE72PQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4g684ZjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4g684JjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4g684pjJEeCGbO5oLE72PQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4g6845jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4g685JjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']"/>
         </ownedDiagramElements>
@@ -290,12 +282,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4gqeMZjJEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4gqeMpjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4gqeMZjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4gqeM5jJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4gqeNJjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4gqeNZjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']"/>
       </ownedDiagramElements>
@@ -305,26 +293,18 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4grFQZjJEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4grFQpjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4grFQZjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4grFQ5jJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4grFRJjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4grFRZjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']"/>
-        <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_4g-AMJjJEeCGbO5oLE72PQ" name="Interface1" incomingEdges="_4hMCoJjJEeCGbO5oLE72PQ">
+        <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_4g-AMJjJEeCGbO5oLE72PQ" name="Interface1" incomingEdges="_4hMCoJjJEeCGbO5oLE72PQ _8qjm8ENXEea_NvY-zhbnXg">
           <target xmi:type="uml:Interface" href="uml2.uml#_YPnwgMovEd64fq8eywf1Ng"/>
           <semanticElements xmi:type="uml:Interface" href="uml2.uml#_YPnwgMovEd64fq8eywf1Ng"/>
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4g-nQJjJEeCGbO5oLE72PQ" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4g-nQZjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4g-nQJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4g-nQpjJEeCGbO5oLE72PQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4g-nQ5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4g-nRJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']"/>
         </ownedDiagramElements>
@@ -335,27 +315,19 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4gsTYJjJEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4gsTYZjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4gsTYJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4gsTYpjJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4gsTY5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4gsTZJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_4hAccJjJEeCGbO5oLE72PQ" name="InAndOutClass2" outgoingEdges="_4hHKIJjJEeCGbO5oLE72PQ _4hMCoJjJEeCGbO5oLE72PQ">
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_4hAccJjJEeCGbO5oLE72PQ" name="InAndOutClass2" outgoingEdges="_4hHKIJjJEeCGbO5oLE72PQ _4hMCoJjJEeCGbO5oLE72PQ _8qjm8ENXEea_NvY-zhbnXg">
         <target xmi:type="uml:Class" href="uml2.uml#_766koMlFEd6R3_bpV99jfA"/>
         <semanticElements xmi:type="uml:Class" href="uml2.uml#_766koMlFEd6R3_bpV99jfA"/>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4hBDgJjJEeCGbO5oLE72PQ" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4hBDgZjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4hBDgJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4hBDgpjJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4hBDg5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4hBDhJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']"/>
       </ownedDiagramElements>
@@ -365,7 +337,6 @@
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FKSmcc31Ed6I_ZSkQ7u_fA" size="2" routingStyle="manhattan">
           <customFeatures>routingStyle</customFeatures>
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@edgeMappings[name='CD_Generalization_Class_To_Class']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_niHWEOT9Ed6Yi7ha-nwtww" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@edgeMappings[name='CD_Generalization_Class_To_Class']"/>
       </ownedDiagramElements>
@@ -374,7 +345,6 @@
         <semanticElements xmi:type="uml:Generalization" href="uml2.uml#_E9k38MlGEd6R3_bpV99jfA"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FKTNgc31Ed6I_ZSkQ7u_fA" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@edgeMappings[name='CD_Generalization_Class_To_Class']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_niHWEeT9Ed6Yi7ha-nwtww" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@edgeMappings[name='CD_Generalization_Class_To_Class']"/>
       </ownedDiagramElements>
@@ -383,7 +353,6 @@
         <semanticElements xmi:type="uml:Generalization" href="uml2.uml#_Q-gVEMq4Ed6_nfwWBm8CPg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FKTNhM31Ed6I_ZSkQ7u_fA" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@edgeMappings[name='CD_Generalization_Class_To_Class']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_niH9IOT9Ed6Yi7ha-nwtww" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@edgeMappings[name='CD_Generalization_Class_To_Class']"/>
       </ownedDiagramElements>
@@ -392,7 +361,6 @@
         <semanticElements xmi:type="uml:InterfaceRealization" href="uml2.uml#_QJZ5EMq4Ed6_nfwWBm8CPg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FKXe8c31Ed6I_ZSkQ7u_fA" lineStyle="dash" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@edgeMappings[name='CD_InterfaceRealization']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_niJyUOT9Ed6Yi7ha-nwtww" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@edgeMappings[name='CD_InterfaceRealization']"/>
       </ownedDiagramElements>
@@ -402,12 +370,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_KDBtUadUEeKPKojEdycshQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_KDBtUqdUEeKPKojEdycshQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_KDBtUadUEeKPKojEdycshQ" borderSize="1" borderSizeComputationExpression="1" backgroundColor="138,226,52">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package_StartsWithAA']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_KDBtU6dUEeKPKojEdycshQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_KDBtVKdUEeKPKojEdycshQ" red="138" green="226" blue="52"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_KDBtVadUEeKPKojEdycshQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package_StartsWithAA']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_KDCUYKdUEeKPKojEdycshQ" name="AAClass">
@@ -416,16 +380,20 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_KDCUYadUEeKPKojEdycshQ" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_KDCUYqdUEeKPKojEdycshQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_KDCUYadUEeKPKojEdycshQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_KDCUY6dUEeKPKojEdycshQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_KDCUZKdUEeKPKojEdycshQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_KDCUZadUEeKPKojEdycshQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']"/>
         </ownedDiagramElements>
       </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_8qjm8ENXEea_NvY-zhbnXg" sourceNode="_4hAccJjJEeCGbO5oLE72PQ" targetNode="_4g-AMJjJEeCGbO5oLE72PQ">
+        <target xmi:type="uml:InterfaceRealization" href="uml2.uml#_QJZ5EMq4Ed6_nfwWBm8CPg"/>
+        <semanticElements xmi:type="uml:InterfaceRealization" href="uml2.uml#_QJZ5EMq4Ed6_nfwWBm8CPg"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_8qjm8UNXEea_NvY-zhbnXg" lineStyle="dash">
+          <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@edgeMappings[name='CD_Dependency_Class_To_Interface']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@edgeMappings[name='CD_Dependency_Class_To_Interface']"/>
+      </ownedDiagramElements>
       <description xmi:type="description_1:DiagramDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']"/>
       <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_Dbrvks31Ed6I_ZSkQ7u_fA"/>
       <target xmi:type="uml:Model" href="uml2.uml#_Wh_KkEjgEd2dA-w4B9F6fQ"/>
@@ -490,26 +458,21 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_rjmqs831Ed6I_ZSkQ7u_fA"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8SuVwkNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8SuVw0NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4hYP4JjJEeCGbO5oLE72PQ" name="RootPackage1">
         <target xmi:type="uml:Package" href="uml2.uml#_05Rt4MlFEd6R3_bpV99jfA"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_05Rt4MlFEd6R3_bpV99jfA"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4hYP4ZjJEeCGbO5oLE72PQ" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4hYP4pjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4hYP4ZjJEeCGbO5oLE72PQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4hYP45jJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4hYP5JjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4hYP5ZjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4hb6QJjJEeCGbO5oLE72PQ" name="ContainerPackageToDrop">
           <target xmi:type="uml:Package" href="uml2.uml#_0KL4oMlYEd6fBP-DQJTG8g"/>
           <semanticElements xmi:type="uml:Package" href="uml2.uml#_0KL4oMlYEd6fBP-DQJTG8g"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4hchUJjJEeCGbO5oLE72PQ" labelSize="10">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4hchUZjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4hchUJjJEeCGbO5oLE72PQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4hchUpjJEeCGbO5oLE72PQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4hchU5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4hchVJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
         </ownedDiagramElements>
@@ -517,36 +480,24 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4hY28JjJEeCGbO5oLE72PQ" name="RootPackage2">
         <target xmi:type="uml:Package" href="uml2.uml#_xEONQMlYEd6fBP-DQJTG8g"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_xEONQMlYEd6fBP-DQJTG8g"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4hY28ZjJEeCGbO5oLE72PQ" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4hY28pjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4hY28ZjJEeCGbO5oLE72PQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4hY285jJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4hY29JjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4hY29ZjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4hZeAJjJEeCGbO5oLE72PQ" name="CanvasPackageToDrop1">
         <target xmi:type="uml:Package" href="uml2.uml#_5WHK8MlYEd6fBP-DQJTG8g"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_5WHK8MlYEd6fBP-DQJTG8g"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4hZeAZjJEeCGbO5oLE72PQ" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4hZeApjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4hZeAZjJEeCGbO5oLE72PQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4hZeA5jJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4hZeBJjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4hZeBZjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4haFEJjJEeCGbO5oLE72PQ" name="CanvasPackageToDrop2">
         <target xmi:type="uml:Package" href="uml2.uml#_smH00MlZEd6fBP-DQJTG8g"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_smH00MlZEd6fBP-DQJTG8g"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4haFEZjJEeCGbO5oLE72PQ" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4haFEpjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4haFEZjJEeCGbO5oLE72PQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4haFE5jJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4haFFJjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4haFFZjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
@@ -556,12 +507,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_c6M8oKjeEeKEzqyeSpufaA" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_c6NjsKjeEeKEzqyeSpufaA"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_c6M8oKjeEeKEzqyeSpufaA" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_c6NjsajeEeKEzqyeSpufaA"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_c6NjsqjeEeKEzqyeSpufaA" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_c6Njs6jeEeKEzqyeSpufaA" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
@@ -583,13 +530,13 @@
                 </children>
                 <children xmi:type="notation:Node" xmi:id="_Me66UNOKEd6hq73CxSc3Hg" type="3012" element="_4jRGQJjJEeCGbO5oLE72PQ">
                   <children xmi:type="notation:Node" xmi:id="_Me7hYNOKEd6hq73CxSc3Hg" type="5010">
-                    <layoutConstraint xmi:type="notation:Location" xmi:id="_Me7hYdOKEd6hq73CxSc3Hg" y="5"/>
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_Me7hYdOKEd6hq73CxSc3Hg" x="-13" y="21"/>
                   </children>
                   <children xmi:type="notation:Node" xmi:id="_Me8vgNOKEd6hq73CxSc3Hg" type="3004" element="_4ja3QJjJEeCGbO5oLE72PQ">
                     <styles xmi:type="notation:ShapeStyle" xmi:id="_Me8vgdOKEd6hq73CxSc3Hg" fontName="Comic Sans MS"/>
                     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Me8vgtOKEd6hq73CxSc3Hg"/>
                   </children>
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Me66UdOKEd6hq73CxSc3Hg" fontName="Comic Sans MS" fontHeight="8"/>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Me66UdOKEd6hq73CxSc3Hg" fontColor="10265827" fontName="Comic Sans MS" fontHeight="8"/>
                   <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Me66UtOKEd6hq73CxSc3Hg" x="172" y="30" width="20" height="20"/>
                 </children>
                 <styles xmi:type="notation:ShapeStyle" xmi:id="_Kl5_sdOJEd6hq73CxSc3Hg" fontName="Comic Sans MS" fontHeight="10"/>
@@ -621,6 +568,28 @@
                   <styles xmi:type="notation:ShapeStyle" xmi:id="_vlnL9MUBEeCCRJc48YB8Ug" fontName="Comic Sans MS" fontHeight="8"/>
                   <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vlnL9cUBEeCCRJc48YB8Ug" x="-12" width="20" height="20"/>
                 </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmEgENYEea_NvY-zhbnXg" visible="false" type="3012" element="_AZcTgENYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmEg0NYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmEhENYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmEikNYEea_NvY-zhbnXg" type="3004" element="_AZcTgUNYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEi0NYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEjENYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEgUNYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEgkNYEea_NvY-zhbnXg" x="-12" width="20" height="20"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmEhUNYEea_NvY-zhbnXg" visible="false" type="3012" element="_AZcTgkNYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmEiENYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmEiUNYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmEjUNYEea_NvY-zhbnXg" type="3004" element="_AZcTg0NYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEjkNYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEj0NYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEhkNYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEh0NYEea_NvY-zhbnXg" x="-12" width="20" height="20"/>
+                </children>
                 <styles xmi:type="notation:ShapeStyle" xmi:id="_vlkvscUBEeCCRJc48YB8Ug" fontName="Comic Sans MS" fontHeight="10"/>
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vlkvssUBEeCCRJc48YB8Ug" x="210" y="29"/>
               </children>
@@ -641,6 +610,39 @@
                   <styles xmi:type="notation:ShapeStyle" xmi:id="_vloaEcUBEeCCRJc48YB8Ug" fontName="Comic Sans MS" fontHeight="8"/>
                   <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vloaEsUBEeCCRJc48YB8Ug" x="-12" width="20" height="20"/>
                 </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmEkENYEea_NvY-zhbnXg" visible="false" type="3012" element="_AZcThENYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmEk0NYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmElENYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmEn0NYEea_NvY-zhbnXg" type="3004" element="_AZcThUNYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEoENYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEoUNYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEkUNYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEkkNYEea_NvY-zhbnXg" x="-12" width="20" height="20"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmElUNYEea_NvY-zhbnXg" visible="false" type="3012" element="_AZcThkNYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmEmENYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmEmUNYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmEokNYEea_NvY-zhbnXg" type="3004" element="_AZcTh0NYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEo0NYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEpENYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmElkNYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEl0NYEea_NvY-zhbnXg" x="-12" width="20" height="20"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmEmkNYEea_NvY-zhbnXg" visible="false" type="3012" element="_AZcTiENYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmEnUNYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmEnkNYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmEpUNYEea_NvY-zhbnXg" type="3004" element="_AZcTiUNYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEpkNYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEp0NYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEm0NYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEnENYEea_NvY-zhbnXg" x="-12" width="20" height="20"/>
+                </children>
                 <styles xmi:type="notation:ShapeStyle" xmi:id="_vllWxcUBEeCCRJc48YB8Ug" fontName="Comic Sans MS" fontHeight="10"/>
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vllWxsUBEeCCRJc48YB8Ug" x="420" y="29"/>
               </children>
@@ -650,6 +652,39 @@
                   <styles xmi:type="notation:SortingStyle" xmi:id="_vlnL8cUBEeCCRJc48YB8Ug"/>
                   <styles xmi:type="notation:FilteringStyle" xmi:id="_vlnL8sUBEeCCRJc48YB8Ug"/>
                 </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmEqENYEea_NvY-zhbnXg" visible="false" type="3012" element="_AZcTikNYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmEq0NYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmErENYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmEt0NYEea_NvY-zhbnXg" type="3004" element="_AZcTi0NYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEuENYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEuUNYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEqUNYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEqkNYEea_NvY-zhbnXg" x="-12" width="20" height="20"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmErUNYEea_NvY-zhbnXg" visible="false" type="3012" element="_AZcTjENYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmEsENYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmEsUNYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmEukNYEea_NvY-zhbnXg" type="3004" element="_AZcTjUNYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEu0NYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEvENYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmErkNYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEr0NYEea_NvY-zhbnXg" x="-12" width="20" height="20"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmEskNYEea_NvY-zhbnXg" visible="false" type="3012" element="_AZcTjkNYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmEtUNYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmEtkNYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmEvUNYEea_NvY-zhbnXg" type="3004" element="_AZcTj0NYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEvkNYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEv0NYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEs0NYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEtENYEea_NvY-zhbnXg" x="-12" width="20" height="20"/>
+                </children>
                 <styles xmi:type="notation:ShapeStyle" xmi:id="_vlmk4cUBEeCCRJc48YB8Ug" fontName="Comic Sans MS" fontHeight="10"/>
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vlmk4sUBEeCCRJc48YB8Ug" x="30" y="29"/>
               </children>
@@ -756,6 +791,39 @@
                   <styles xmi:type="notation:ShapeStyle" xmi:id="_w8DCYXQkEeGzhLaBlPZdWw" fontName="Comic Sans MS" fontHeight="8"/>
                   <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w8DCYnQkEeGzhLaBlPZdWw" x="88" y="62" width="20" height="20"/>
                 </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmEwENYEea_NvY-zhbnXg" type="3012" element="_AZcTkENYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmEw0NYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmExENYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmEz0NYEea_NvY-zhbnXg" type="3004" element="_AZcTkUNYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmE0ENYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmE0UNYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEwUNYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEwkNYEea_NvY-zhbnXg" x="109" y="72" width="20" height="20"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmExUNYEea_NvY-zhbnXg" type="3012" element="_AZcTkkNYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmEyENYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmEyUNYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmE0kNYEea_NvY-zhbnXg" type="3004" element="_AZcTk0NYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmE00NYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmE1ENYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmExkNYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEx0NYEea_NvY-zhbnXg" x="-12" y="61" width="20" height="20"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmEykNYEea_NvY-zhbnXg" type="3012" element="_AZcTlENYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmEzUNYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmEzkNYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmE1UNYEea_NvY-zhbnXg" type="3004" element="_AZcTlUNYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmE1kNYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmE10NYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmEy0NYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmEzENYEea_NvY-zhbnXg" x="9" y="82" width="20" height="20"/>
+                </children>
                 <styles xmi:type="notation:ShapeStyle" xmi:id="_w75RYXQkEeGzhLaBlPZdWw" fontName="Comic Sans MS" fontHeight="10"/>
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w75RYnQkEeGzhLaBlPZdWw" x="28" y="29"/>
               </children>
@@ -807,6 +875,28 @@
                   <styles xmi:type="notation:ShapeStyle" xmi:id="_w8K-MXQkEeGzhLaBlPZdWw" fontName="Comic Sans MS" fontHeight="8"/>
                   <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w8K-MnQkEeGzhLaBlPZdWw" x="-12" y="40" width="20" height="20"/>
                 </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmE2ENYEea_NvY-zhbnXg" type="3012" element="_AZcTlkNYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmE20NYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmE3ENYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmE4kNYEea_NvY-zhbnXg" type="3004" element="_AZcTl0NYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmE40NYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmE5ENYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmE2UNYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmE2kNYEea_NvY-zhbnXg" x="9" y="60" width="20" height="20"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_AZmE3UNYEea_NvY-zhbnXg" type="3012" element="_AZcTmENYEea_NvY-zhbnXg">
+                  <children xmi:type="notation:Node" xmi:id="_AZmE4ENYEea_NvY-zhbnXg" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AZmE4UNYEea_NvY-zhbnXg" x="21"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_AZmE5UNYEea_NvY-zhbnXg" type="3004" element="_AZcTmUNYEea_NvY-zhbnXg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmE5kNYEea_NvY-zhbnXg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmE50NYEea_NvY-zhbnXg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AZmE3kNYEea_NvY-zhbnXg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZmE30NYEea_NvY-zhbnXg" x="30" y="70" width="20" height="20"/>
+                </children>
                 <styles xmi:type="notation:ShapeStyle" xmi:id="_w8Ih8XQkEeGzhLaBlPZdWw" fontName="Comic Sans MS" fontHeight="10"/>
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w8Ih8nQkEeGzhLaBlPZdWw" x="28" y="29"/>
               </children>
@@ -819,15 +909,14 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_DM-qUdOJEd6hq73CxSc3Hg"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8SuVxENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8SuVxUNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4jOqAJjJEeCGbO5oLE72PQ" name="ParentComponent">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4jPREJjJEeCGbO5oLE72PQ" labelSize="10" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4jPREZjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4jPREJjJEeCGbO5oLE72PQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4jPREpjJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4jPRE5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4jPRFJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4jQfMJjJEeCGbO5oLE72PQ" name="InnerComponent">
@@ -836,20 +925,14 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4jRGQJjJEeCGbO5oLE72PQ" name="DropPort" width="2" height="2">
             <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4ja3QJjJEeCGbO5oLE72PQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4ja3QZjJEeCGbO5oLE72PQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4ja3QJjJEeCGbO5oLE72PQ" showIcon="false" labelColor="227,164,156">
+              <customFeatures>labelColor</customFeatures>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4ja3QpjJEeCGbO5oLE72PQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_oFMN8eT9Ed6Yi7ha-nwtww"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4jQfMZjJEeCGbO5oLE72PQ" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4jQfMpjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4jQfMZjJEeCGbO5oLE72PQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4jQfM5jJEeCGbO5oLE72PQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4jQfNJjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4jQfNZjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         </ownedDiagramElements>
@@ -858,12 +941,8 @@
         <target xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
         <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_aJnH8MUCEeCCRJc48YB8Ug"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_vlX7YMUBEeCCRJc48YB8Ug" labelSize="10" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_vlX7YcUBEeCCRJc48YB8Ug"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_vlX7YMUBEeCCRJc48YB8Ug" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_vlX7YsUBEeCCRJc48YB8Ug"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_vlX7Y8UBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_vlX7ZMUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_vlYicMUBEeCCRJc48YB8Ug" name="InnerComponent1" visible="false">
@@ -873,19 +952,28 @@
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_vla-sMUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_vla-scUBEeCCRJc48YB8Ug"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_vla-ssUBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_vla-s8UBEeCCRJc48YB8Ug"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_vlZJgMUBEeCCRJc48YB8Ug" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_vlZJgcUBEeCCRJc48YB8Ug"/>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcTgENYEea_NvY-zhbnXg" name="Port4" visible="false" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcTgUNYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcTgkNYEea_NvY-zhbnXg" name="Port9" visible="false" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcTg0NYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_vlZJgMUBEeCCRJc48YB8Ug" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_vlZJgsUBEeCCRJc48YB8Ug"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_vlZJg8UBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_vlZJhMUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         </ownedDiagramElements>
@@ -896,31 +984,68 @@
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_vlcM0cUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_vlcM0sUBEeCCRJc48YB8Ug"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_vlcM08UBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_vlcM1MUBEeCCRJc48YB8Ug"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_vlZwkMUBEeCCRJc48YB8Ug" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_vlZwkcUBEeCCRJc48YB8Ug"/>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcThENYEea_NvY-zhbnXg" name="collapsedPortToMove1" visible="false" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcThUNYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcThkNYEea_NvY-zhbnXg" name="collapsedPort2" visible="false" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcTh0NYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcTiENYEea_NvY-zhbnXg" name="Port3" visible="false" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcTiUNYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_vlZwkMUBEeCCRJc48YB8Ug" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_vlZwksUBEeCCRJc48YB8Ug"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_vlZwk8UBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_vlZwlMUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         </ownedDiagramElements>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_vlZwlcUBEeCCRJc48YB8Ug" name="InnerComponent3" visible="false">
           <target xmi:type="uml:Component" href="uml2.uml#_0tyyQcT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Component" href="uml2.uml#_0tyyQcT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_vlZwlsUBEeCCRJc48YB8Ug" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_vlZwl8UBEeCCRJc48YB8Ug"/>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcTikNYEea_NvY-zhbnXg" name="collapsedPort1" visible="false" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcTi0NYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcTjENYEea_NvY-zhbnXg" name="Port5" visible="false" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcTjUNYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcTjkNYEea_NvY-zhbnXg" name="Port6" visible="false" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcTj0NYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_vlZwlsUBEeCCRJc48YB8Ug" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_vlZwmMUBEeCCRJc48YB8Ug"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_vlZwmcUBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_vlZwmsUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         </ownedDiagramElements>
@@ -928,12 +1053,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_w7V3wHQkEeGzhLaBlPZdWw" name="AnotherParentComponent">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_w7V3wXQkEeGzhLaBlPZdWw" labelSize="10" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7V3wnQkEeGzhLaBlPZdWw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_w7V3wXQkEeGzhLaBlPZdWw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7V3w3QkEeGzhLaBlPZdWw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_w7V3xHQkEeGzhLaBlPZdWw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_w7V3xXQkEeGzhLaBlPZdWw" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_w7XF4HQkEeGzhLaBlPZdWw" name="ComponentWithnPorts">
@@ -943,10 +1064,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_w7Y7EHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7Y7EXQkEeGzhLaBlPZdWw"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7Y7EnQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_w7Y7E3QkEeGzhLaBlPZdWw"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -954,10 +1072,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_w7ZiIHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7ZiIXQkEeGzhLaBlPZdWw"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7ZiInQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_w7ZiI3QkEeGzhLaBlPZdWw"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -965,10 +1080,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_w7aJMHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7aJMXQkEeGzhLaBlPZdWw"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7aJMnQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_w7aJM3QkEeGzhLaBlPZdWw"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -976,10 +1088,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_w7bXUHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7bXUXQkEeGzhLaBlPZdWw"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7bXUnQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_w7bXU3QkEeGzhLaBlPZdWw"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -987,10 +1096,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_w7b-YHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7b-YXQkEeGzhLaBlPZdWw"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7b-YnQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_w7b-Y3QkEeGzhLaBlPZdWw"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -998,10 +1104,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_w7clcHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7clcXQkEeGzhLaBlPZdWw"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7clcnQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_w7clc3QkEeGzhLaBlPZdWw"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -1009,10 +1112,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_w7dMgHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7dMgXQkEeGzhLaBlPZdWw"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7dMgnQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_w7dMg3QkEeGzhLaBlPZdWw"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -1020,19 +1120,36 @@
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_w7eaoHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7eaoXQkEeGzhLaBlPZdWw"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7eaonQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_w7eao3QkEeGzhLaBlPZdWw"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_w7XF4XQkEeGzhLaBlPZdWw" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7XF4nQkEeGzhLaBlPZdWw"/>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcTkENYEea_NvY-zhbnXg" name="collapsePort3" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcTkUNYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcTkkNYEea_NvY-zhbnXg" name="collapsePort1" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcTk0NYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcTlENYEea_NvY-zhbnXg" name="collapsePort2" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcTlUNYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_w7XF4XQkEeGzhLaBlPZdWw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7XF43QkEeGzhLaBlPZdWw"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_w7XF5HQkEeGzhLaBlPZdWw" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_w7XF5XQkEeGzhLaBlPZdWw" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         </ownedDiagramElements>
@@ -1040,12 +1157,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_w7V3xnQkEeGzhLaBlPZdWw" name="AnotherParentComponent2">
         <target xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_w7We0HQkEeGzhLaBlPZdWw" labelSize="10" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7We0XQkEeGzhLaBlPZdWw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_w7We0HQkEeGzhLaBlPZdWw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7We0nQkEeGzhLaBlPZdWw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_w7We03QkEeGzhLaBlPZdWw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_w7We1HQkEeGzhLaBlPZdWw" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_w7gP0HQkEeGzhLaBlPZdWw" name="ComponentWith3Ports">
@@ -1055,10 +1168,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_w7hd8HQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7hd8XQkEeGzhLaBlPZdWw"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7hd8nQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_w7hd83QkEeGzhLaBlPZdWw"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -1066,10 +1176,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_w7iFAHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7iFAXQkEeGzhLaBlPZdWw"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7iFAnQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_w7iFA3QkEeGzhLaBlPZdWw"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -1077,19 +1184,28 @@
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_w7isEXQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7isEnQkEeGzhLaBlPZdWw"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7isE3QkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_w7isFHQkEeGzhLaBlPZdWw"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_w7g24HQkEeGzhLaBlPZdWw" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w7g24XQkEeGzhLaBlPZdWw"/>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcTlkNYEea_NvY-zhbnXg" name="collapsePort1" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcTl0NYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_AZcTmENYEea_NvY-zhbnXg" name="collapsePort2" width="2" height="2">
+            <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
+            <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AZcTmUNYEea_NvY-zhbnXg" showIcon="false">
+              <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
+          </ownedBorderedNodes>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_w7g24HQkEeGzhLaBlPZdWw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_w7g24nQkEeGzhLaBlPZdWw"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_w7g243QkEeGzhLaBlPZdWw" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_w7g25HQkEeGzhLaBlPZdWw" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         </ownedDiagramElements>
@@ -1861,36 +1977,30 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8SuVxkNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8SuVx0NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_4jr9AJjJEeCGbO5oLE72PQ" visible="false" width="10" height="10" resizeKind="EAST_WEST">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4jtLIJjJEeCGbO5oLE72PQ" name="DropPort" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4jtyMJjJEeCGbO5oLE72PQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4jtyMZjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4jtyMJjJEeCGbO5oLE72PQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4jtyMpjJEeCGbO5oLE72PQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_clunw3VaEd-cw95GEMJD8Q" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDsXcErcEeSRw9blU02bnQ" name="LinkedDropPort" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_4NY3cEpNEeSo2unxERPWgg"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_4NY3cEpNEeSo2unxERPWgg"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDsXcUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDsXckrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDsXcUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDsXc0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDsXdErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_4jskEJjJEeCGbO5oLE72PQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4jskEZjJEeCGbO5oLE72PQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4jskEpjJEeCGbO5oLE72PQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_4jskE5jJEeCGbO5oLE72PQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']"/>
       </ownedDiagramElements>
@@ -1900,118 +2010,85 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_csph4MUBEeCCRJc48YB8Ug" name="Port1" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_csqI8MUBEeCCRJc48YB8Ug" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_csqI8cUBEeCCRJc48YB8Ug"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_csqI8MUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_csqI8sUBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_csqI88UBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_csqwAMUBEeCCRJc48YB8Ug" name="Port2" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_csqwAcUBEeCCRJc48YB8Ug" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_csqwAsUBEeCCRJc48YB8Ug"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_csqwAcUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_csqwA8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_csqwBMUBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDs-gErcEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDs-gUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDs-gkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDs-gUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDs-g0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDs-hErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDtlkErcEeSRw9blU02bnQ" name="Port7" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDtlkUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDtlkkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDtlkUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDtlk0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDtllErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDuMoErcEeSRw9blU02bnQ" name="collapsedPortToMove1" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDuMoUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDuMokrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDuMoUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDuMo0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDuMpErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDuMpUrcEeSRw9blU02bnQ" name="collapsedPort2" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDuzsErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDuzsUrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDuzsErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDuzskrcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDuzs0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDuztErcEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDuztUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDuztkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDuztUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDuzt0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDuzuErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDvawErcEeSRw9blU02bnQ" name="collapsedPort1" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDvawUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDvawkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDvawUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDvaw0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDvaxErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDvaxUrcEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDwB0ErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDwB0UrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDwB0ErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDwB0krcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDwB00rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDwB1ErcEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDwB1UrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDwB1krcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDwB1UrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDwB10rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDwB2ErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_cso60cUBEeCCRJc48YB8Ug" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cso60sUBEeCCRJc48YB8Ug"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cso608UBEeCCRJc48YB8Ug"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_cso61MUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']"/>
       </ownedDiagramElements>
@@ -2021,129 +2098,93 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDj0kErcEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDj0kUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDj0kkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDj0kUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDj0k0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDj0lErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDj0lUrcEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDkboErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDkboUrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDkboErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDkbokrcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDkbo0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDkbpErcEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDkbpUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDkbpkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDkbpUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDkbp0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDkbqErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDlCsErcEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDlCsUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDlCskrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDlCsUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDlCs0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDlCtErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDlCtUrcEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDlpwErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDlpwUrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDlpwErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDlpwkrcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDlpw0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDlpxErcEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDlpxUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDlpxkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDlpxUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDlpx0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDlpyErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDmQ0ErcEeSRw9blU02bnQ" name="Port8" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDmQ0UrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDmQ0krcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDmQ0UrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDmQ00rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDmQ1ErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDmQ1UrcEeSRw9blU02bnQ" name="Port9" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDmQ1krcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDmQ10rcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDmQ1krcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDmQ2ErcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDmQ2UrcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDm34ErcEeSRw9blU02bnQ" name="collapsePort3" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDm34UrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDm34krcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDm34UrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDm340rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDm35ErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDm35UrcEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDne8ErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDne8UrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDne8ErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDne8krcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDne80rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDne9ErcEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDoGAErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDoGAUrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDoGAErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDoGAkrcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDoGA0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_bDimcUrcEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDimckrcEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDimc0rcEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_bDimdErcEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']"/>
       </ownedDiagramElements>
@@ -2153,63 +2194,45 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDpUIErcEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDp7MErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDp7MUrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDp7MErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDp7MkrcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDp7M0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDqiQErcEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDqiQUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDqiQkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDqiQUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDqiQ0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDqiRErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDqiRUrcEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDrJUErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDrJUUrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDrJUErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDrJUkrcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDrJU0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDrJVErcEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDrJVUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDrJVkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDrJVUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDrJV0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDrJWErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bDrwYErcEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDrwYUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDrwYkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bDrwYUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDrwY0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_bDrwZErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_bDjNgErcEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bDjNgUrcEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bDjNgkrcEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_bDjNg0rcEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']"/>
       </ownedDiagramElements>
@@ -2222,19 +2245,13 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qviIUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7qviIkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qviIUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7qviI0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7qviJErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_7qtF4UrcEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7qtF4krcEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7qtF40rcEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_7qtF5ErcEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']"/>
       </ownedDiagramElements>
@@ -2244,118 +2261,85 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7qwwQErcEeSRw9blU02bnQ" name="Port1" outgoingEdges="_AMQlgkrdEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qwwQUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7qwwQkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qwwQUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7qwwQ0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7qwwRErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7qxXUErcEeSRw9blU02bnQ" name="Port4" outgoingEdges="_AMRMkErdEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qxXUUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7qxXUkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qxXUUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7qxXU0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7qxXVErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7qx-YErcEeSRw9blU02bnQ" name="Port7" outgoingEdges="_AMRMk0rdEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qx-YUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7qx-YkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qx-YUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7qx-Y0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7qx-ZErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7qx-ZUrcEeSRw9blU02bnQ" name="Port2" incomingEdges="_AMQlgkrdEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qylcErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7qylcUrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qylcErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7qylckrcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7qylc0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7qyldErcEeSRw9blU02bnQ" name="collapsedPortToMove1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qyldUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7qyldkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qyldUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7qyld0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7qyleErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7qzMgErcEeSRw9blU02bnQ" name="collapsedPort2" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qzMgUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7qzMgkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qzMgUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7qzMg0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7qzMhErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7qzMhUrcEeSRw9blU02bnQ" name="Port3" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qzzkErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7qzzkUrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qzzkErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7qzzkkrcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7qzzk0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7qzzlErcEeSRw9blU02bnQ" name="collapsedPort1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qzzlUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7qzzlkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7qzzlUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7qzzl0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7qzzmErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q0aoErcEeSRw9blU02bnQ" name="Port5" incomingEdges="_AMRMkErdEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q0aoUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q0aokrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q0aoUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q0ao0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q0apErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q0apUrcEeSRw9blU02bnQ" name="Port6" incomingEdges="_AMRMk0rdEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q0apkrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q0ap0rcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q0apkrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q0aqErcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q0aqUrcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_7qts8UrcEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7qts8krcEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7qts80rcEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_7qts9ErcEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']"/>
       </ownedDiagramElements>
@@ -2365,129 +2349,93 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q1BsErcEeSRw9blU02bnQ" name="Port1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q1BsUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q1BskrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q1BsUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q1Bs0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q1BtErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q1owErcEeSRw9blU02bnQ" name="Port2" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q1owUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q1owkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q1owUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q1ow0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q1oxErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q2P0ErcEeSRw9blU02bnQ" name="Port3" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q2P0UrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q2P0krcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q2P0UrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q2P00rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q2P1ErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q2P1UrcEeSRw9blU02bnQ" name="Port4" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q224ErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q224UrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q224ErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q224krcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q2240rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q225ErcEeSRw9blU02bnQ" name="Port5" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q225UrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q225krcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q225UrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q2250rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q226ErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q3d8ErcEeSRw9blU02bnQ" name="Port6" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q3d8UrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q3d8krcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q3d8UrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q3d80rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q3d9ErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q3d9UrcEeSRw9blU02bnQ" name="Port8" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q4FAErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q4FAUrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q4FAErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q4FAkrcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q4FA0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q4FBErcEeSRw9blU02bnQ" name="Port9" incomingEdges="_j9kQQEreEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q4sEErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q4sEUrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q4sEErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q4sEkrcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q4sE0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q4sFErcEeSRw9blU02bnQ" name="collapsePort3" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q5TIErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q5TIUrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q5TIErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q5TIkrcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q5TI0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q5TJErcEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q56MErcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q56MUrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q56MErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q56MkrcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q56M0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q6hQErcEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q6hQUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q6hQkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q6hQUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q6hQ0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q6hRErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_7quUAUrcEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7quUAkrcEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7quUA0rcEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_7quUBErcEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']"/>
       </ownedDiagramElements>
@@ -2497,63 +2445,45 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q7IUErcEeSRw9blU02bnQ" name="Port1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q7IUUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q7IUkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q7IUUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q7IU0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q7IVErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q7vYErcEeSRw9blU02bnQ" name="Port2" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q7vYUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q7vYkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q7vYUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q7vY0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q7vZErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q8WcErcEeSRw9blU02bnQ" name="Port3" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q8WcUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q8WckrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q8WcUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q8Wc0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q8WdErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q89gErcEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q89gUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q89gkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q89gUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q89g0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q89hErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7q9kkErcEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q9kkUrcEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7q9kkkrcEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7q9kkUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7q9kk0rcEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7q9klErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_7qu7EErcEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7qu7EUrcEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7qu7EkrcEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_7qu7E0rcEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']"/>
       </ownedDiagramElements>
@@ -2562,7 +2492,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_BgK4kMT4EeCCRJc48YB8Ug"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_AMQlg0rdEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_AMQlhErdEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -2571,7 +2500,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_AMRMkUrdEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_AMRMkkrdEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -2580,7 +2508,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_s84zwkpyEeSU7I_GWuX6JQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_AMRzoErdEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_AMRzoUrdEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -2589,7 +2516,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M4v_4ErVEeSRw9blU02bnQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_j9kQQUreEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_j9k3UEreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -3001,6 +2927,9 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8SuVyENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8SuVyUNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4jxckJjJEeCGbO5oLE72PQ">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
@@ -3010,20 +2939,13 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uED_IUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uED_IkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uED_IUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uED_I0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uED_JEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4jxckZjJEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4jxckpjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4jxckZjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4jxck5jJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4jxclJjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4jxclZjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']"/>
       </ownedDiagramElements>
@@ -3033,119 +2955,85 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD5nFUreEeSRw9blU02bnQ" name="Port1" outgoingEdges="_uEHpgkreEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD5nFkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD5nF0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD5nFkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD5nGEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD5nGUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD6OIEreEeSRw9blU02bnQ" name="Port4" outgoingEdges="_uEIQkkreEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD6OIUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD6OIkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD6OIUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD6OI0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD6OJEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD6OJUreEeSRw9blU02bnQ" name="Port9" outgoingEdges="_uEI3oEreEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD61MEreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD61MUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD61MEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD61MkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD61M0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD61NEreEeSRw9blU02bnQ" name="Port2" incomingEdges="_uEHpgkreEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD61NUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD61NkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD61NUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD61N0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD61OEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD61OUreEeSRw9blU02bnQ" name="collapsedPortToMove1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD7cQEreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD7cQUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD7cQEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD7cQkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD7cQ0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD7cREreEeSRw9blU02bnQ" name="collapsedPort2" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD7cRUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD7cRkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD7cRUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD7cR0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD7cSEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD8DUEreEeSRw9blU02bnQ" name="Port3" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD8DUUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD8DUkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD8DUUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD8DU0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD8DVEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD8DVUreEeSRw9blU02bnQ" name="collapsedPort1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD8DVkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD8DV0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD8DVkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD8DWEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD8DWUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD8qYEreEeSRw9blU02bnQ" name="Port5" incomingEdges="_uEIQkkreEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD8qYUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD8qYkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD8qYUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD8qY0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD8qZEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD8qZUreEeSRw9blU02bnQ" name="Port6" incomingEdges="_uEI3oEreEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD8qZkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD8qZ0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD8qZkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD8qaEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD8qaUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_uD4Y8UreEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD4Y8kreEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_uD4Y8UreEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD4Y80reEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_uD4Y9EreEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_uD4Y9UreEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']"/>
       </ownedDiagramElements>
@@ -3155,130 +3043,93 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD9RcEreEeSRw9blU02bnQ" name="Port1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD94gEreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD94gUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD94gEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD94gkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD94g0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD94hEreEeSRw9blU02bnQ" name="Port2" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD94hUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD94hkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD94hUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD94h0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD94iEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD-fkEreEeSRw9blU02bnQ" name="Port3" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD-fkUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD-fkkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD-fkUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD-fk0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD-flEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD-flUreEeSRw9blU02bnQ" name="Port4" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD-flkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD-fl0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD-flkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD-fmEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD-fmUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD_GoEreEeSRw9blU02bnQ" name="Port5" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD_GoUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD_GokreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD_GoUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD_Go0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD_GpEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD_tsEreEeSRw9blU02bnQ" name="Port6" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD_tsUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD_tskreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uD_tsUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD_ts0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uD_ttEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uD_ttUreEeSRw9blU02bnQ" name="Port8" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEAUwEreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uEAUwUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEAUwEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uEAUwkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uEAUw0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uEAUxEreEeSRw9blU02bnQ" name="Port7" incomingEdges="_uEHCcEreEeSRw9blU02bnQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEAUxUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uEAUxkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEAUxUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uEAUx0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uEAUyEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uEA70EreEeSRw9blU02bnQ" name="collapsePort3" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEA70UreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uEA70kreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEA70UreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uEA700reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uEA71EreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uEA71UreEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEA71kreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uEA710reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEA71kreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uEA72EreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uEA72UreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uEBi4EreEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEBi4UreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uEBi4kreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEBi4UreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uEBi40reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uEBi5EreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_uD5AAUreEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD5AAkreEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_uD5AAUreEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD5AA0reEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_uD5ABEreEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_uD5ABUreEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']"/>
       </ownedDiagramElements>
@@ -3288,64 +3139,45 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uEBi5UreEeSRw9blU02bnQ" name="Port1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uECJ8EreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uECJ8UreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uECJ8EreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uECJ8kreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uECJ80reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uECJ9EreEeSRw9blU02bnQ" name="Port2" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uECJ9UreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uECJ9kreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uECJ9UreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uECJ90reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uECJ-EreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uECxAEreEeSRw9blU02bnQ" name="Port3" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uECxAUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uECxAkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uECxAUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uECxA0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uECxBEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uECxBUreEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEDYEEreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uEDYEUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEDYEEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uEDYEkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uEDYE0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uEDYFEreEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEDYFUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uEDYFkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uEDYFUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uEDYF0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_uEDYGEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_uD5nEEreEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uD5nEUreEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_uD5nEEreEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uD5nEkreEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_uD5nE0reEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_uD5nFEreEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']"/>
       </ownedDiagramElements>
@@ -3354,7 +3186,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M4v_4ErVEeSRw9blU02bnQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_uEHpgEreEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_uEHpgUreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -3363,7 +3194,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_BgK4kMT4EeCCRJc48YB8Ug"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_uEIQkEreEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_uEIQkUreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -3372,7 +3202,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_uEIQk0reEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_uEIQlEreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -3381,7 +3210,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_s84zwkpyEeSU7I_GWuX6JQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_uEI3oUreEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_uEI3okreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -3859,15 +3687,14 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8SuVykNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8SuVy0NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4kJQAJjJEeCGbO5oLE72PQ">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4kJ3EJjJEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4kJ3EZjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4kJ3EJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4kJ3EpjJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4kJ3E5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4kJ3FJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_4kKeIJjJEeCGbO5oLE72PQ" width="10" height="10" resizeKind="EAST_WEST">
@@ -3879,19 +3706,13 @@
             <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
             <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
             <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Fm4QkUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Fm4QkkrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Fm4QkUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Fm4Qk0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Fm4QlErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_4kQkwJjJEeCGbO5oLE72PQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4kQkwZjJEeCGbO5oLE72PQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4kQkwpjJEeCGbO5oLE72PQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_4kQkw5jJEeCGbO5oLE72PQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']"/>
         </ownedDiagramElements>
@@ -3899,12 +3720,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_hSEN0MUBEeCCRJc48YB8Ug">
         <target xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_hSEN0cUBEeCCRJc48YB8Ug">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_hSEN0sUBEeCCRJc48YB8Ug"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_hSEN0cUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_hSEN08UBEeCCRJc48YB8Ug"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_hSEN1MUBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_hSEN1cUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_hSFb8MUBEeCCRJc48YB8Ug" width="10" height="10" resizeKind="EAST_WEST">
@@ -3913,41 +3730,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fm768ErcEeSRw9blU02bnQ" name="Port1" outgoingEdges="_Kdc98ErcEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Fm768UrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Fm768krcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Fm768UrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Fm7680rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Fm769ErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fm8iAErcEeSRw9blU02bnQ" name="Port4" outgoingEdges="_KddlAErcEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Fm8iAUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Fm8iAkrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Fm8iAUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Fm8iA0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Fm8iBErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fm--QErcEeSRw9blU02bnQ" name="Port9" outgoingEdges="_KdeMEErcEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Fm--QUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Fm--QkrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Fm--QUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Fm--Q0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Fm--RErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_hSFb8cUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_hSFb8sUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_hSFb88UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_hSFb9MUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']"/>
         </ownedDiagramElements>
@@ -3957,52 +3762,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fm_lUErcEeSRw9blU02bnQ" name="Port2" incomingEdges="_Kdc98ErcEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnAMYErcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnAMYUrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnAMYErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnAMYkrcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnAMY0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnAMZErcEeSRw9blU02bnQ" name="collapsedPortToMove1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnAMZUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnAMZkrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnAMZUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnAMZ0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnAMaErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnAzcErcEeSRw9blU02bnQ" name="collapsedPort2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnAzcUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnAzckrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnAzcUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnAzc0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnAzdErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnBagErcEeSRw9blU02bnQ" name="Port3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnBagUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnBagkrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnBagUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnBag0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnBahErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_hSGDAcUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_hSGDAsUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_hSGDA8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_hSGDBMUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']"/>
         </ownedDiagramElements>
@@ -4012,41 +3802,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnCBkErcEeSRw9blU02bnQ" name="collapsedPort1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnCooErcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnCooUrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnCooErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnCookrcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnCoo0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnD2wErcEeSRw9blU02bnQ" name="Port5" incomingEdges="_KddlAErcEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnEd0ErcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnEd0UrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnEd0ErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnEd0krcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnEd00rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnFE4ErcEeSRw9blU02bnQ" name="Port6" incomingEdges="_KdeMEErcEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnFr8ErcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnFr8UrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnFr8ErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnFr8krcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnFr80rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_hSGqEMUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_hSGqEcUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_hSGqEsUBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_hSGqE8UBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']"/>
         </ownedDiagramElements>
@@ -4054,12 +3832,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7Y3kcErbEeSRw9blU02bnQ">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Y4LgErbEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Y4LgUrbEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Y4LgErbEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Y4LgkrbEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Y4Lg0rbEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Y4LhErbEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_7Y6AsErbEeSRw9blU02bnQ" width="10" height="10" resizeKind="EAST_WEST">
@@ -4068,129 +3842,93 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnG6EErcEeSRw9blU02bnQ" name="Port1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnHhIErcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnHhIUrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnHhIErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnHhIkrcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnHhI0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnIIMErcEeSRw9blU02bnQ" name="Port2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnIIMUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnIIMkrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnIIMUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnIIM0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnIINErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnIvQErcEeSRw9blU02bnQ" name="Port3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnJWUErcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnJWUUrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnJWUErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnJWUkrcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnJWU0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnJWVErcEeSRw9blU02bnQ" name="Port4" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnJ9YErcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnJ9YUrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnJ9YErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnJ9YkrcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnJ9Y0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnJ9ZErcEeSRw9blU02bnQ" name="Port5" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnKkcErcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnKkcUrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnKkcErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnKkckrcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnKkc0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnNAsErcEeSRw9blU02bnQ" name="Port6" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnNAsUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnNAskrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnNAsUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnNAs0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnNAtErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnNnwErcEeSRw9blU02bnQ" name="Port8" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnNnwUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnNnwkrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnNnwUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnNnw0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnNnxErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnOO0ErcEeSRw9blU02bnQ" name="Port7" incomingEdges="_j9JZgEreEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnO14ErcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnO14UrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnO14ErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnO14krcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnO140rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnPc8ErcEeSRw9blU02bnQ" name="collapsePort3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnQEAErcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnQEAUrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnQEAErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnQEAkrcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnQEA0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnQEBErcEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnQrEErcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnQrEUrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnQrEErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnQrEkrcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnQrE0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnQrFErcEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnQrFUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnQrFkrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnQrFUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnQrF0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnQrGErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_7Y6nwErbEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Y6nwUrbEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Y6nwkrbEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Y6nw0rbEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']"/>
         </ownedDiagramElements>
@@ -4198,12 +3936,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7Y4ykErbEeSRw9blU02bnQ">
         <target xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Y5ZoErbEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Y5ZoUrbEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Y5ZoErbEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Y5ZokrbEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Y5Zo0rbEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Y5ZpErbEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_7ZAHUErbEeSRw9blU02bnQ" width="10" height="10" resizeKind="EAST_WEST">
@@ -4212,63 +3946,45 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnR5MErcEeSRw9blU02bnQ" name="Port1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnSgQErcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnSgQUrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnSgQErcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnSgQkrcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnSgQ0rcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnSgRErcEeSRw9blU02bnQ" name="Port2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnSgRUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnSgRkrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnSgRUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnSgR0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnSgSErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnTHUErcEeSRw9blU02bnQ" name="Port3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnTHUUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnTHUkrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnTHUUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnTHU0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnTHVErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnTuYErcEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnTuYUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnTuYkrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnTuYUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnTuY0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnTuZErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_FnUVcErcEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnUVcUrcEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FnUVckrcEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FnUVcUrcEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_FnUVc0rcEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FnUVdErcEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_7ZAHUUrbEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7ZAHUkrbEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7ZAHU0rbEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7ZAHVErbEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']"/>
         </ownedDiagramElements>
@@ -4278,7 +3994,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_BgK4kMT4EeCCRJc48YB8Ug"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Kdc98UrcEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Kdc98krcEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -4287,7 +4002,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_KddlAUrcEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_KddlAkrcEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -4296,7 +4010,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_s84zwkpyEeSU7I_GWuX6JQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_KdeMEUrcEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_KdeMEkrcEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -4305,7 +4018,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M4v_4ErVEeSRw9blU02bnQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_j9KAkEreEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_j9KAkUreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -4771,15 +4483,14 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4GwENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4GwUNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4knxIJjJEeCGbO5oLE72PQ">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4knxIZjJEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4knxIpjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4knxIZjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4knxI5jJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4knxJJjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4knxJZjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4kz-YJjJEeCGbO5oLE72PQ">
@@ -4788,20 +4499,13 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4k424JjJEeCGbO5oLE72PQ" name="DropPort" outgoingEdges="_y2uc4EreEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4k_kkJjJEeCGbO5oLE72PQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4k_kkZjJEeCGbO5oLE72PQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4k_kkJjJEeCGbO5oLE72PQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4k_kkpjJEeCGbO5oLE72PQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_kQbCkXVaEd-cw95GEMJD8Q" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4kz-YZjJEeCGbO5oLE72PQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4k0lcJjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4kz-YZjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4k0lcZjJEeCGbO5oLE72PQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4k0lcpjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4k0lc5jJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         </ownedDiagramElements>
@@ -4809,12 +4513,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_aMVhQMUBEeCCRJc48YB8Ug">
         <target xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_aMVhQcUBEeCCRJc48YB8Ug">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aMVhQsUBEeCCRJc48YB8Ug"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_aMVhQcUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_aMVhQ8UBEeCCRJc48YB8Ug"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_aMVhRMUBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_aMVhRcUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_aMWvYMUBEeCCRJc48YB8Ug">
@@ -4823,42 +4523,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_aMYkkMUBEeCCRJc48YB8Ug" name="Port1" outgoingEdges="_nopiQkrbEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_aMZLoMUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aMZLocUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_aMZLoMUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_aMZLosUBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_aMZLo8UBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZb5AEpPEeSo2unxERPWgg" name="Port4" outgoingEdges="_noqJUkrbEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZb5AUpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZb5AkpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZb5AUpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZb5A0pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZb5BEpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_BilcEErZEeSRw9blU02bnQ" name="Port7" outgoingEdges="_noqwYkrbEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_BilcEUrZEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_BilcEkrZEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_BilcEUrZEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_BilcE0rZEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_BilcFErZEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_aMWvYcUBEeCCRJc48YB8Ug">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aMWvYsUBEeCCRJc48YB8Ug"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_aMWvYcUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_aMWvY8UBEeCCRJc48YB8Ug"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_aMWvZMUBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_aMWvZcUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         </ownedDiagramElements>
@@ -4868,53 +4555,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_aMZysMUBEeCCRJc48YB8Ug" name="Port2" incomingEdges="_nopiQkrbEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_aMZyscUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aMZyssUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_aMZyscUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_aMZys8UBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_aMZytMUBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZdHIEpPEeSo2unxERPWgg" name="collapsedPortToMove1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZdHIUpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZdHIkpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZdHIUpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZdHI0pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZdHJEpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZduMEpPEeSo2unxERPWgg" name="collapsedPort2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZeVQEpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZeVQUpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZeVQEpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZeVQkpPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZeVQ0pPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZeVREpPEeSo2unxERPWgg" name="Port3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZe8UEpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZe8UUpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZe8UEpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZe8UkpPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZe8U0pPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_aMXWccUBEeCCRJc48YB8Ug">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aMXWcsUBEeCCRJc48YB8Ug"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_aMXWccUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_aMXWc8UBEeCCRJc48YB8Ug"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_aMXWdMUBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_aMXWdcUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         </ownedDiagramElements>
@@ -4924,42 +4595,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZfjYEpPEeSo2unxERPWgg" name="collapsedPort1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZfjYUpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZfjYkpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZfjYUpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZfjY0pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZfjZEpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZgKcEpPEeSo2unxERPWgg" name="Port5" incomingEdges="_noqJUkrbEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZgKcUpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZgKckpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZgKcUpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZgKc0pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZgKdEpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_BiqUkErZEeSRw9blU02bnQ" name="Port6" incomingEdges="_noqwYkrbEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Biq7oErZEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Biq7oUrZEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Biq7oErZEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Biq7okrZEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Biq7o0rZEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_aMX9gcUBEeCCRJc48YB8Ug">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aMX9gsUBEeCCRJc48YB8Ug"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_aMX9gcUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_aMX9g8UBEeCCRJc48YB8Ug"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_aMX9hMUBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_aMX9hcUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         </ownedDiagramElements>
@@ -4967,12 +4625,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_bZOdoEpPEeSo2unxERPWgg">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bZOdoUpPEeSo2unxERPWgg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZOdokpPEeSo2unxERPWgg"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bZOdoUpPEeSo2unxERPWgg" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZOdo0pPEeSo2unxERPWgg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_bZOdpEpPEeSo2unxERPWgg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_bZOdpUpPEeSo2unxERPWgg" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_bZPEtUpPEeSo2unxERPWgg">
@@ -4981,130 +4635,93 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZPrxUpPEeSo2unxERPWgg" name="Port1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZQS0EpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZQS0UpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZQS0EpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZQS0kpPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZQS00pPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZQS1EpPEeSo2unxERPWgg" name="Port2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZQS1UpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZQS1kpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZQS1UpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZQS10pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZQS2EpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZQ54EpPEeSo2unxERPWgg" name="Port3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZQ54UpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZQ54kpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZQ54UpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZQ540pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZQ55EpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZRg8EpPEeSo2unxERPWgg" name="Port4" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZRg8UpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZRg8kpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZRg8UpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZRg80pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZRg9EpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZRg9UpPEeSo2unxERPWgg" name="Port5" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZSIAEpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZSIAUpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZSIAEpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZSIAkpPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZSIA0pPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZSIBEpPEeSo2unxERPWgg" name="Port6" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZSIBUpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZSIBkpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZSIBUpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZSIB0pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZSICEpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZTWIEpPEeSo2unxERPWgg" name="Port8" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZTWIUpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZTWIkpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZTWIUpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZTWI0pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZTWJEpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZT9MEpPEeSo2unxERPWgg" name="collapsePort3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZT9MUpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZT9MkpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZT9MUpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZT9M0pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZT9NEpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZUkQEpPEeSo2unxERPWgg" name="collapsePort1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZUkQUpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZUkQkpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZUkQUpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZUkQ0pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZUkREpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZUkRUpPEeSo2unxERPWgg" name="collapsePort2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZVLUEpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZVLUUpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZVLUEpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZVLUkpPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZVLU0pPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_uS43kErZEeSRw9blU02bnQ" name="Port9" incomingEdges="_y2uc4EreEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uS5eoErZEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uS5eoUrZEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uS5eoErZEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uS5eokrZEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_uS5eo0rZEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bZPrwEpPEeSo2unxERPWgg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZPrwUpPEeSo2unxERPWgg"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bZPrwEpPEeSo2unxERPWgg" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZPrwkpPEeSo2unxERPWgg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_bZPrw0pPEeSo2unxERPWgg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_bZPrxEpPEeSo2unxERPWgg" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         </ownedDiagramElements>
@@ -5112,12 +4729,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_bZOdpkpPEeSo2unxERPWgg">
         <target xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bZPEsEpPEeSo2unxERPWgg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZPEsUpPEeSo2unxERPWgg"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bZPEsEpPEeSo2unxERPWgg" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZPEskpPEeSo2unxERPWgg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_bZPEs0pPEeSo2unxERPWgg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_bZPEtEpPEeSo2unxERPWgg" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_bZVyYEpPEeSo2unxERPWgg">
@@ -5126,64 +4739,45 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZWZdUpPEeSo2unxERPWgg" name="Port1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZXAgEpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZXAgUpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZXAgEpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZXAgkpPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZXAg0pPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZXAhEpPEeSo2unxERPWgg" name="Port2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZXAhUpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZXAhkpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZXAhUpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZXAh0pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZXAiEpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZXnkEpPEeSo2unxERPWgg" name="Port3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZXnkUpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZXnkkpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZXnkUpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZXnk0pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZXnlEpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZXnlUpPEeSo2unxERPWgg" name="collapsePort1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZYOoEpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZYOoUpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZYOoEpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZYOokpPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZYOo0pPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_bZYOpEpPEeSo2unxERPWgg" name="collapsePort2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZYOpUpPEeSo2unxERPWgg" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZYOpkpPEeSo2unxERPWgg"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bZYOpUpPEeSo2unxERPWgg" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZYOp0pPEeSo2unxERPWgg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_bZYOqEpPEeSo2unxERPWgg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bZWZcEpPEeSo2unxERPWgg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bZWZcUpPEeSo2unxERPWgg"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bZWZcEpPEeSo2unxERPWgg" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_bZWZckpPEeSo2unxERPWgg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_bZWZc0pPEeSo2unxERPWgg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_bZWZdEpPEeSo2unxERPWgg" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         </ownedDiagramElements>
@@ -5193,7 +4787,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_BgK4kMT4EeCCRJc48YB8Ug"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_noqJUErbEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_noqJUUrbEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -5202,7 +4795,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_noqwYErbEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_noqwYUrbEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -5211,7 +4803,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_s84zwkpyEeSU7I_GWuX6JQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_norXcErbEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_norXcUrbEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -5220,7 +4811,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M4v_4ErVEeSRw9blU02bnQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_y2vD8EreEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_y2vD8UreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -6094,6 +5684,9 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4GwkNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4Gw0NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4lFEIJjJEeCGbO5oLE72PQ" visible="false">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
@@ -6103,28 +5696,18 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4lRRYJjJEeCGbO5oLE72PQ" name="DropPort" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4lU7wJjJEeCGbO5oLE72PQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4lU7wZjJEeCGbO5oLE72PQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4lU7wJjJEeCGbO5oLE72PQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4lU7wpjJEeCGbO5oLE72PQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_l4E843VaEd-cw95GEMJD8Q" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_4lQqUJjJEeCGbO5oLE72PQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4lQqUZjJEeCGbO5oLE72PQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4lQqUpjJEeCGbO5oLE72PQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_4lQqU5jJEeCGbO5oLE72PQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4lFEIZjJEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4lFEIpjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4lFEIZjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4lFEI5jJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4lFEJJjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4lFEJZjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -6137,41 +5720,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iWuv0MUBEeCCRJc48YB8Ug" name="Port1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iWuv0cUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iWuv0sUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iWuv0cUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iWuv08UBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iWuv1MUBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2MW78EreEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MW78UreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2MW78kreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MW78UreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2MW780reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2MW79EreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2MXjAEreEeSRw9blU02bnQ" name="Port7" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MXjAUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2MXjAkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MXjAUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2MXjA0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2MXjBEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_iWs6oMUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iWs6ocUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iWs6osUBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_iWs6o8UBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
@@ -6181,52 +5752,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iWvW4MUBEeCCRJc48YB8Ug" name="Port2" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iWv98MUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iWv98cUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iWv98MUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iWv98sUBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iWv988UBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2MYKEEreEeSRw9blU02bnQ" name="collapsedPortToMove1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MYKEUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2MYKEkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MYKEUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2MYKE0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2MYKFEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2MYKFUreEeSRw9blU02bnQ" name="collapsedPort2" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MYxIEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2MYxIUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MYxIEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2MYxIkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2MYxI0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2MYxJEreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MYxJUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2MYxJkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MYxJUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2MYxJ0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2MYxKEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_iWthsMUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iWthscUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iWthssUBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_iWths8UBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
@@ -6236,50 +5792,34 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2MZYMEreEeSRw9blU02bnQ" name="collapsedPort1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MZ_QEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2MZ_QUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MZ_QEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2MZ_QkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2MZ_Q0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2MZ_REreEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MamUEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2MamUUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MamUEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2MamUkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2MamU0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2MamVEreEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MamVUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2MamVkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2MamVUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2MamV0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2MamWEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_iWuIwMUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iWuIwcUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iWuIwsUBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_iWuIw8UBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iWrsgcUBEeCCRJc48YB8Ug">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iWrsgsUBEeCCRJc48YB8Ug"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iWrsgcUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iWrsg8UBEeCCRJc48YB8Ug"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iWrshMUBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iWrshcUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -6292,138 +5832,98 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Hp_PYHQkEeGzhLaBlPZdWw" name="Port1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Hp_2cHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Hp_2cXQkEeGzhLaBlPZdWw"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Hp_2cHQkEeGzhLaBlPZdWw" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Hp_2cnQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Hp_2c3QkEeGzhLaBlPZdWw" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Hp_2dHQkEeGzhLaBlPZdWw" name="Port2" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqAdgHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HqAdgXQkEeGzhLaBlPZdWw"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqAdgHQkEeGzhLaBlPZdWw" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_HqAdgnQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_HqAdg3QkEeGzhLaBlPZdWw" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_HqAdhHQkEeGzhLaBlPZdWw" name="Port3" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqAdhXQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HqAdhnQkEeGzhLaBlPZdWw"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqAdhXQkEeGzhLaBlPZdWw" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_HqAdh3QkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_HqAdiHQkEeGzhLaBlPZdWw" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_HqBEkHQkEeGzhLaBlPZdWw" name="Port4" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqBEkXQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HqBEknQkEeGzhLaBlPZdWw"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqBEkXQkEeGzhLaBlPZdWw" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_HqBEk3QkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_HqBElHQkEeGzhLaBlPZdWw" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_HqBroHQkEeGzhLaBlPZdWw" name="Port5" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqBroXQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HqBronQkEeGzhLaBlPZdWw"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqBroXQkEeGzhLaBlPZdWw" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_HqBro3QkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_HqBrpHQkEeGzhLaBlPZdWw" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_HqCSsHQkEeGzhLaBlPZdWw" name="Port6" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqCSsXQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HqCSsnQkEeGzhLaBlPZdWw"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqCSsXQkEeGzhLaBlPZdWw" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_HqCSs3QkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_HqCStHQkEeGzhLaBlPZdWw" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_HqCStXQkEeGzhLaBlPZdWw" name="Port9" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqC5wHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HqC5wXQkEeGzhLaBlPZdWw"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqC5wHQkEeGzhLaBlPZdWw" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_HqC5wnQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_HqC5w3QkEeGzhLaBlPZdWw" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_HqC5xHQkEeGzhLaBlPZdWw" name="Port8" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqDg0HQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HqDg0XQkEeGzhLaBlPZdWw"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqDg0HQkEeGzhLaBlPZdWw" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_HqDg0nQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_HqDg03QkEeGzhLaBlPZdWw" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2Mb0cEreEeSRw9blU02bnQ" name="collapsePort3" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2Mb0cUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2Mb0ckreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2Mb0cUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2Mb0c0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2Mb0dEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2Mb0dUreEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2McbgEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2McbgUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2McbgEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2McbgkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2Mcbg0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2McbhEreEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2McbhUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2McbhkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2McbhUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2Mcbh0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2McbiEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_Hp-oUHQkEeGzhLaBlPZdWw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Hp-oUXQkEeGzhLaBlPZdWw"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Hp-oUnQkEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Hp-oU3QkEeGzhLaBlPZdWw" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Hp9aMHQkEeGzhLaBlPZdWw">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Hp9aMXQkEeGzhLaBlPZdWw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Hp9aMHQkEeGzhLaBlPZdWw" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Hp9aMnQkEeGzhLaBlPZdWw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Hp9aM3QkEeGzhLaBlPZdWw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Hp9aNHQkEeGzhLaBlPZdWw" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -6436,72 +5936,50 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_HqEH5HQkEeGzhLaBlPZdWw" name="Port1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqEu8HQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HqEu8XQkEeGzhLaBlPZdWw"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqEu8HQkEeGzhLaBlPZdWw" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_HqEu8nQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_HqEu83QkEeGzhLaBlPZdWw" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_HqEu9HQkEeGzhLaBlPZdWw" name="Port2" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqFWAHQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HqFWAXQkEeGzhLaBlPZdWw"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqFWAHQkEeGzhLaBlPZdWw" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_HqFWAnQkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_HqFWA3QkEeGzhLaBlPZdWw" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_HqFWBHQkEeGzhLaBlPZdWw" name="Port3" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqFWBXQkEeGzhLaBlPZdWw" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HqFWBnQkEeGzhLaBlPZdWw"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_HqFWBXQkEeGzhLaBlPZdWw" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_HqFWB3QkEeGzhLaBlPZdWw"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_HqFWCHQkEeGzhLaBlPZdWw" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2Me3wEreEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2Me3wUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2Me3wkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2Me3wUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2Me3w0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2Me3xEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2Me3xUreEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2Me3xkreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2Me3x0reEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2Me3xkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2Me3yEreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2Me3yUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_HqEH4HQkEeGzhLaBlPZdWw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HqEH4XQkEeGzhLaBlPZdWw"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_HqEH4nQkEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_HqEH43QkEeGzhLaBlPZdWw" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Hp-BQXQkEeGzhLaBlPZdWw">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Hp-BQnQkEeGzhLaBlPZdWw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Hp-BQXQkEeGzhLaBlPZdWw" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Hp-BQ3QkEeGzhLaBlPZdWw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Hp-BRHQkEeGzhLaBlPZdWw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Hp-BRXQkEeGzhLaBlPZdWw" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -6514,28 +5992,18 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iHJUErgEeSRw9blU02bnQ" name="DropPort" outgoingEdges="_6igK4ErgEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iHJUUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iHJUkrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iHJUUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iHJU0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iHJVErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_6iGiQUrgEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iGiQkrgEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iGiQ0rgEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_6iGiRErgEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6iEtEUrgEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iEtEkrgEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6iEtEUrgEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iEtE0rgEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6iEtFErgEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6iEtFUrgEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -6548,41 +6016,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iJlkErgEeSRw9blU02bnQ" name="Port1" outgoingEdges="_6igx8ErgEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iKMoErgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iKMoUrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iKMoErgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iKMokrgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iKMo0rgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iKzsErgEeSRw9blU02bnQ" name="Port4" outgoingEdges="_6ihZAErgEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iKzsUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iKzskrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iKzsUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iKzs0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iKztErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iLawErgEeSRw9blU02bnQ" name="Port7" outgoingEdges="_6ihZA0rgEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iLawUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iLawkrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iLawUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iLaw0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iLaxErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_6iHwYUrgEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iHwYkrgEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iHwY0rgEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_6iHwZErgEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
@@ -6592,52 +6048,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iMB0ErgEeSRw9blU02bnQ" name="Port2" incomingEdges="_6igx8ErgEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iMB0UrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iMB0krgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iMB0UrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iMB00rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iMB1ErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iMo4ErgEeSRw9blU02bnQ" name="collapsedPortToMove1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iMo4UrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iMo4krgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iMo4UrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iMo40rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iMo5ErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iNP8ErgEeSRw9blU02bnQ" name="collapsedPort2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iNP8UrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iNP8krgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iNP8UrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iNP80rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iNP9ErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iN3AErgEeSRw9blU02bnQ" name="Port3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iN3AUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iN3AkrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iN3AUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iN3A0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iN3BErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_6iIXcUrgEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iIXckrgEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iIXc0rgEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_6iIXdErgEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
@@ -6647,50 +6088,34 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iOeEErgEeSRw9blU02bnQ" name="collapsedPort1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iPFIErgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iPFIUrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iPFIErgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iPFIkrgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iPFI0rgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iPFJErgEeSRw9blU02bnQ" name="Port5" incomingEdges="_6ihZAErgEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iPFJUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iPFJkrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iPFJUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iPFJ0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iPFKErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iPsMErgEeSRw9blU02bnQ" name="Port6" incomingEdges="_6ihZA0rgEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iPsMUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iPsMkrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iPsMUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iPsM0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iPsNErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_6iI-gUrgEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iI-gkrgEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iI-g0rgEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_6iI-hErgEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6iFUIErgEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iFUIUrgEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6iFUIErgEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iFUIkrgEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6iFUI0rgEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6iFUJErgEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -6703,138 +6128,98 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iRhYErgEeSRw9blU02bnQ" name="Port1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iRhYUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iRhYkrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iRhYUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iRhY0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iRhZErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iSIcErgEeSRw9blU02bnQ" name="Port2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iSIcUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iSIckrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iSIcUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iSIc0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iSIdErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iSvgErgEeSRw9blU02bnQ" name="Port3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iSvgUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iSvgkrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iSvgUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iSvg0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iSvhErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iTWkErgEeSRw9blU02bnQ" name="Port4" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iTWkUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iTWkkrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iTWkUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iTWk0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iTWlErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iT9oErgEeSRw9blU02bnQ" name="Port5" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iT9oUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iT9okrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iT9oUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iT9o0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iT9pErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iUksErgEeSRw9blU02bnQ" name="Port6" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iUksUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iUkskrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iUksUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iUks0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iUktErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iVLwErgEeSRw9blU02bnQ" name="Port8" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iVy0ErgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iVy0UrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iVy0ErgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iVy0krgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iVy00rgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iVy1ErgEeSRw9blU02bnQ" name="Port9" incomingEdges="_6igK4ErgEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iWZ4ErgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iWZ4UrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iWZ4ErgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iWZ4krgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iWZ40rgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iWZ5ErgEeSRw9blU02bnQ" name="collapsePort3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iXA8ErgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iXA8UrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iXA8ErgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iXA8krgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iXA80rgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iXA9ErgEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iXoAErgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iXoAUrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iXoAErgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iXoAkrgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iXoA0rgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iXoBErgEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iYPEErgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iYPEUrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iYPEErgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iYPEkrgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iYPE0rgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_6iQ6UUrgEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iQ6UkrgEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iQ6U0rgEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_6iQ6VErgEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6iFUJkrgEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iFUJ0rgEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6iFUJkrgEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iFUKErgEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6iFUKUrgEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6iFUKkrgEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -6847,72 +6232,50 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iZdMErgEeSRw9blU02bnQ" name="Port1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iaEQErgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iaEQUrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iaEQErgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iaEQkrgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iaEQ0rgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iaERErgEeSRw9blU02bnQ" name="Port2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iaERUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iaERkrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iaERUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iaER0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iaESErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6iarUErgEeSRw9blU02bnQ" name="Port3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iarUUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iarUkrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6iarUUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iarU0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6iarVErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ibSYErgEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ibSYUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ibSYkrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ibSYUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ibSY0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ibSZErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ib5cErgEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ib5cUrgEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ib5ckrgEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ib5cUrgEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ib5c0rgEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ib5dErgEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_6iY2IUrgEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iY2IkrgEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iY2I0rgEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_6iY2JErgEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6iF7MUrgEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6iF7MkrgEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6iF7MUrgEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6iF7M0rgEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6iF7NErgEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6iF7NUrgEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -6921,7 +6284,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M4v_4ErVEeSRw9blU02bnQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_6igK4UrgEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_6igK4krgEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -6930,7 +6292,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_BgK4kMT4EeCCRJc48YB8Ug"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_6igx8UrgEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_6igx8krgEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -6939,7 +6300,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_6ihZAUrgEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_6ihZAkrgEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -6948,7 +6308,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_s84zwkpyEeSU7I_GWuX6JQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_6ihZBErgEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_6ihZBUrgEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -7838,6 +7197,9 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4GxENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4GxUNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_4labUJjJEeCGbO5oLE72PQ" visible="false" width="10" height="10" resizeKind="EAST_WEST">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
@@ -7847,27 +7209,18 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4lqS8JjJEeCGbO5oLE72PQ" name="DropPort" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4lq6AJjJEeCGbO5oLE72PQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4lq6AZjJEeCGbO5oLE72PQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4lq6AJjJEeCGbO5oLE72PQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4lq6ApjJEeCGbO5oLE72PQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_naMP4nVaEd-cw95GEMJD8Q" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_4liXIJjJEeCGbO5oLE72PQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4liXIZjJEeCGbO5oLE72PQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4liXIpjJEeCGbO5oLE72PQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_4liXI5jJEeCGbO5oLE72PQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_4labUZjJEeCGbO5oLE72PQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4labUpjJEeCGbO5oLE72PQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4labU5jJEeCGbO5oLE72PQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_4labVJjJEeCGbO5oLE72PQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -7880,41 +7233,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_mPRusMUBEeCCRJc48YB8Ug" name="Port1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_mPSVwMUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_mPSVwcUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_mPSVwMUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_mPSVwsUBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_mPSVw8UBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vdB8EreEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vdpAEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vdpAUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vdpAEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vdpAkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vdpA0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vdpBEreEeSRw9blU02bnQ" name="Port7" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vdpBUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vdpBkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vdpBUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vdpB0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vdpCEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_mPP5gcUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_mPP5gsUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_mPP5g8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_mPP5hMUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -7924,52 +7265,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_mPS80MUBEeCCRJc48YB8Ug" name="Port2" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_mPS80cUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_mPS80sUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_mPS80cUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_mPS808UBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_mPS81MUBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2veQEEreEeSRw9blU02bnQ" name="collapsedPortToMove1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2veQEUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2veQEkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2veQEUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2veQE0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2veQFEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2ve3IEreEeSRw9blU02bnQ" name="collapsedPort2" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2ve3IUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2ve3IkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2ve3IUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2ve3I0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2ve3JEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2ve3JUreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vfeMEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vfeMUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vfeMEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vfeMkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vfeM0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_mPQgkcUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_mPQgksUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_mPQgk8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_mPQglMUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -7979,49 +7305,34 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vfeNEreEeSRw9blU02bnQ" name="collapsedPort1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vgFQEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vgFQUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vgFQEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vgFQkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vgFQ0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vgFREreEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vgFRUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vgFRkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vgFRUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vgFR0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vgFSEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vgsUEreEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vgsUUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vgsUkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vgsUUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vgsU0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vgsVEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_mPRHocUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_mPRHosUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_mPRHo8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_mPRHpMUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_mPPScMUBEeCCRJc48YB8Ug" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_mPPSccUBEeCCRJc48YB8Ug"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_mPPScsUBEeCCRJc48YB8Ug"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_mPPSc8UBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -8034,137 +7345,98 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vUfFEreEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vUfFUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vUfFkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vUfFUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vUfF0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vUfGEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vVGIEreEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vVGIUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vVGIkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vVGIUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vVGI0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vVGJEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vVGJUreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vVtMEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vVtMUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vVtMEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vVtMkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vVtM0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vVtNEreEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vVtNUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vVtNkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vVtNUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vVtN0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vVtOEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vWUQEreEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vWUQUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vWUQkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vWUQUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vWUQ0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vWUREreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vWURUreEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vWURkreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vWUR0reEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vWURkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vWUSEreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vWUSUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vW7UEreEeSRw9blU02bnQ" name="Port8" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vW7UUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vW7UkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vW7UUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vW7U0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vW7VEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vW7VUreEeSRw9blU02bnQ" name="Port9" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vXiYEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vXiYUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vXiYEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vXiYkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vXiY0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vXiZEreEeSRw9blU02bnQ" name="collapsePort3" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vXiZUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vXiZkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vXiZUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vXiZ0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vXiaEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vYJcEreEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vYJcUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vYJckreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vYJcUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vYJc0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vYJdEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vYJdUreEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vYwgEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vYwgUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vYwgEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vYwgkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vYwg0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_2vUfEEreEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vUfEUreEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vUfEkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_2vUfE0reEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_2vTQ8UreEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vTQ8kreEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vTQ80reEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_2vTQ9EreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -8177,71 +7449,50 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vZXlEreEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vZXlUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vZXlkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vZXlUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vZXl0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vZXmEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vZ-oEreEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vZ-oUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vZ-okreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vZ-oUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vZ-o0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vZ-pEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2valsEreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2valsUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2valskreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2valsUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vals0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2valtEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vbMwEreEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vbMwUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vbMwkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vbMwUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vbMw0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vbMxEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_2vbMxUreEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vbMxkreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vbMx0reEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_2vbMxkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vbMyEreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_2vbMyUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_2vZXkEreEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vZXkUreEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vZXkkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_2vZXk0reEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_2vT4AUreEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2vT4AkreEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_2vT4A0reEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_2vT4BEreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -8254,27 +7505,18 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MZ5qRUrhEeSRw9blU02bnQ" name="DropPort" outgoingEdges="_MaKI8ErhEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ6RUErhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ6RUUrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ6RUErhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ6RUkrhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ6RU0rhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_MZ5qQUrhEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ5qQkrhEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ5qQ0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ5qRErhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_MZ4cIErhEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ4cIUrhEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ4cIkrhEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ4cI0rhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -8287,41 +7529,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MZ7fcErhEeSRw9blU02bnQ" name="Port1" outgoingEdges="_MaKwAkrhEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ7fcUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ7fckrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ7fcUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ7fc0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ7fdErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MZ8GgErhEeSRw9blU02bnQ" name="Port4" outgoingEdges="_MaLXEErhEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ8GgUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ8GgkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ8GgUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ8Gg0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ8GhErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MZ8tkErhEeSRw9blU02bnQ" name="Port7" outgoingEdges="_MaLXE0rhEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ8tkUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ8tkkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ8tkUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ8tk0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ8tlErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_MZ6RVUrhEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ6RVkrhEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ6RV0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ6RWErhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -8331,44 +7561,32 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MZ9UoErhEeSRw9blU02bnQ" name="Port2" incomingEdges="_MaKwAkrhEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ9UoUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ9UokrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ9UoUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ9Uo0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ9UpErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MZ9UpUrhEeSRw9blU02bnQ" name="collapsedPortToMove1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ9UpkrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ9Up0rhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ9UpkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ9UqErhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ9UqUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MZ97sErhEeSRw9blU02bnQ" name="collapsedPort2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ97sUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ97skrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ97sUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ97s0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ97tErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MZ-iwErhEeSRw9blU02bnQ" name="Port3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ-iwUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ-iwkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ-iwUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ-iw0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ-ixErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
@@ -8376,10 +7594,7 @@
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_MZ64YUrhEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ64YkrhEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ64Y0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ64ZErhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -8389,33 +7604,24 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MZ_J0ErhEeSRw9blU02bnQ" name="collapsedPort1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ_J0UrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ_J0krhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ_J0UrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ_J00rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ_J1ErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MZ_w4ErhEeSRw9blU02bnQ" name="Port5" incomingEdges="_MaLXEErhEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ_w4UrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ_w4krhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZ_w4UrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ_w40rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ_w5ErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaAX8ErhEeSRw9blU02bnQ" name="Port6" incomingEdges="_MaLXE0rhEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaAX8UrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaAX8krhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaAX8UrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaAX80rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaAX9ErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
@@ -8423,10 +7629,7 @@
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_MZ64ZkrhEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ64Z0rhEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ64aErhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ64aUrhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -8434,10 +7637,7 @@
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_MZ4cJUrhEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ4cJkrhEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ4cJ0rhEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ4cKErhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -8450,121 +7650,88 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaBmEErhEeSRw9blU02bnQ" name="Port1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaBmEUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaBmEkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaBmEUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaBmE0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaBmFErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaCNIErhEeSRw9blU02bnQ" name="Port2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaCNIUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaCNIkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaCNIUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaCNI0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaCNJErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaCNJUrhEeSRw9blU02bnQ" name="Port3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaCNJkrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaCNJ0rhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaCNJkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaCNKErhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaCNKUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaC0MErhEeSRw9blU02bnQ" name="Port4" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaC0MUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaC0MkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaC0MUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaC0M0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaC0NErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaC0NUrhEeSRw9blU02bnQ" name="Port5" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaC0NkrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaC0N0rhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaC0NkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaC0OErhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaC0OUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaDbQErhEeSRw9blU02bnQ" name="Port6" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaDbQUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaDbQkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaDbQUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaDbQ0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaDbRErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaDbRUrhEeSRw9blU02bnQ" name="Port8" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaECUErhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaECUUrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaECUErhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaECUkrhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaECU0rhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaECVErhEeSRw9blU02bnQ" name="Port9" incomingEdges="_MaKI8ErhEeSRw9blU02bnQ" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaECVUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaECVkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaECVUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaECV0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaECWErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaEpYErhEeSRw9blU02bnQ" name="collapsePort3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaEpYUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaEpYkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaEpYUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaEpY0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaEpZErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaEpZUrhEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaEpZkrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaEpZ0rhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaEpZkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaEpaErhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaEpaUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaFQcErhEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaFQcUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaFQckrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaFQcUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaFQc0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaFQdErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
@@ -8572,10 +7739,7 @@
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_MaA_AUrhEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaA_AkrhEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaA_A0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_MaA_BErhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -8583,10 +7747,7 @@
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_MZ5DMErhEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ5DMUrhEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ5DMkrhEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ5DM0rhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -8599,55 +7760,40 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaF3hUrhEeSRw9blU02bnQ" name="Port1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaGekErhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaGekUrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaGekErhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaGekkrhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaGek0rhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaGelErhEeSRw9blU02bnQ" name="Port2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaGelUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaGelkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaGelUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaGel0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaGemErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaGemUrhEeSRw9blU02bnQ" name="Port3" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaHFoErhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaHFoUrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaHFoErhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaHFokrhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaHFo0rhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaHFpErhEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaHFpUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaHFpkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaHFpUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaHFp0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaHFqErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_MaHssErhEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaHssUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaHsskrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MaHssUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaHss0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_MaHstErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']"/>
           </ownedBorderedNodes>
@@ -8655,10 +7801,7 @@
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_MaF3gUrhEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaF3gkrhEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaF3g0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_MaF3hErhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -8666,10 +7809,7 @@
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_MZ5DNUrhEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ5DNkrhEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ5DN0rhEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_MZ5DOErhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -8678,7 +7818,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M4v_4ErVEeSRw9blU02bnQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MaKwAErhEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_MaKwAUrhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -8687,7 +7826,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_BgK4kMT4EeCCRJc48YB8Ug"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MaKwA0rhEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_MaKwBErhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -8696,7 +7834,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MaLXEUrhEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_MaLXEkrhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -8705,7 +7842,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_s84zwkpyEeSU7I_GWuX6JQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MaLXFErhEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_MaLXFUrhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -9521,25 +8657,22 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4GxkNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4Gx0NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_4lvLcJjJEeCGbO5oLE72PQ" visible="false" width="10" height="10" resizeKind="EAST_WEST">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4lwZkJjJEeCGbO5oLE72PQ" name="DropPort" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4lxAoJjJEeCGbO5oLE72PQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4lxAoZjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4lxAoJjJEeCGbO5oLE72PQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4lxAopjJEeCGbO5oLE72PQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_2mBnQHViEd-KTclN5jfG4g" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_4lvLcZjJEeCGbO5oLE72PQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4lvLcpjJEeCGbO5oLE72PQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4lvLc5jJEeCGbO5oLE72PQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_4lvLdJjJEeCGbO5oLE72PQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']"/>
       </ownedDiagramElements>
@@ -9549,30 +8682,21 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_rDz0sMUBEeCCRJc48YB8Ug" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_rDz0scUBEeCCRJc48YB8Ug" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rDz0ssUBEeCCRJc48YB8Ug"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_rDz0scUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rDz0s8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_rDz0tMUBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_rD0bwMUBEeCCRJc48YB8Ug" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_rD1C0MUBEeCCRJc48YB8Ug" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rD1C0cUBEeCCRJc48YB8Ug"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_rD1C0MUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rD1C0sUBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_rD1C08UBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_rDzNoMUBEeCCRJc48YB8Ug" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rDzNocUBEeCCRJc48YB8Ug"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rDzNosUBEeCCRJc48YB8Ug"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_rDzNo8UBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']"/>
       </ownedDiagramElements>
@@ -9585,19 +8709,13 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUSORkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUSOR0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUSORkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUSOSEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUSOSUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_UURAIUreEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UURAIkreEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UURAI0reEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_UURAJEreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']"/>
       </ownedDiagramElements>
@@ -9607,118 +8725,85 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUS1VUreEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUTcYEreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUTcYUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUTcYEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUTcYkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUTcY0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUTcZEreEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUTcZUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUTcZkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUTcZUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUTcZ0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUTcaEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUTcaUreEeSRw9blU02bnQ" name="Port7" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUUDcEreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUUDcUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUUDcEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUUDckreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUUDc0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUUDdEreEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUUDdUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUUDdkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUUDdUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUUDd0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUUDeEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUUqgEreEeSRw9blU02bnQ" name="collapsedPortToMove1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUUqgUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUUqgkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUUqgUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUUqg0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUUqhEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUUqhUreEeSRw9blU02bnQ" name="collapsedPort2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUUqhkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUUqh0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUUqhkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUUqiEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUUqiUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUVRkEreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUVRkUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUVRkkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUVRkUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUVRk0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUVRlEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUVRlUreEeSRw9blU02bnQ" name="collapsedPort1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUVRlkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUVRl0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUVRlkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUVRmEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUVRmUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUV4oEreEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUV4oUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUV4okreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUV4oUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUV4o0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUV4pEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUV4pUreEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUV4pkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUV4p0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUV4pkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUV4qEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUV4qUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_UURnMUreEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UURnMkreEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UURnM0reEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_UURnNEreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']"/>
       </ownedDiagramElements>
@@ -9728,129 +8813,93 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUWfsEreEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUWfsUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUWfskreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUWfsUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUWfs0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUWftEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUXGwEreEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUXGwUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUXGwkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUXGwUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUXGw0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUXGxEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUXGxUreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUXGxkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUXGx0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUXGxkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUXGyEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUXGyUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUXt0EreEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUXt0UreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUXt0kreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUXt0UreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUXt00reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUXt1EreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUXt1UreEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUYU4EreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUYU4UreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUYU4EreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUYU4kreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUYU40reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUYU5EreEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUYU5UreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUYU5kreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUYU5UreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUYU50reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUYU6EreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUY78EreEeSRw9blU02bnQ" name="Port8" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUY78UreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUY78kreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUY78UreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUY780reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUY79EreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUY79UreEeSRw9blU02bnQ" name="Port9" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUY79kreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUY790reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUY79kreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUY7-EreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUY7-UreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUZjAEreEeSRw9blU02bnQ" name="collapsePort3" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUZjAUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUZjAkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUZjAUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUZjA0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUZjBEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUZjBUreEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUZjBkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUZjB0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUZjBkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUZjCEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUZjCUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUaKEEreEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUaKEUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUaKEkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUaKEUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUaKE0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUaKFEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_UURnNkreEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UURnN0reEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UURnOEreEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_UURnOUreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']"/>
       </ownedDiagramElements>
@@ -9860,63 +8909,45 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUaKFUreEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUaxIEreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUaxIUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUaxIEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUaxIkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUaxI0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUaxJEreEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUaxJUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUaxJkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUaxJUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUaxJ0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUaxKEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUaxKUreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUbYMEreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUbYMUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUbYMEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUbYMkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUbYM0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUbYNEreEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUbYNUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUbYNkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUbYNUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUbYN0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUbYOEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UUbYOUreEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUb_QEreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUb_QUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_UUb_QEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUb_QkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UUb_Q0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@borderedNodeMappings[name='CDPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_UUSOQUreEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_UUSOQkreEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_UUSOQ0reEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_UUSOREreEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDPoN_Component']"/>
       </ownedDiagramElements>
@@ -9929,19 +8960,13 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go5fgUriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go5fgkriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go5fgUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go5fg0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go5fhEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_Go4RYEriEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go4RYUriEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go4RYkriEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_Go4RY0riEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']"/>
       </ownedDiagramElements>
@@ -9951,118 +8976,85 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go6GkEriEeSRw9blU02bnQ" name="Port1" outgoingEdges="_GpFFsEriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go6GkUriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go6GkkriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go6GkUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go6Gk0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go6GlEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go6GlUriEeSRw9blU02bnQ" name="Port4" outgoingEdges="_GpFFs0riEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go6GlkriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go6Gl0riEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go6GlkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go6GmEriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go6GmUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go6toEriEeSRw9blU02bnQ" name="Port7" outgoingEdges="_GpFswkriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go6toUriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go6tokriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go6toUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go6to0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go6tpEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go6tpUriEeSRw9blU02bnQ" name="Port2" incomingEdges="_GpFFsEriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go7UsEriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go7UsUriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go7UsEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go7UskriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go7Us0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go7UtEriEeSRw9blU02bnQ" name="collapsedPortToMove1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go7UtUriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go7UtkriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go7UtUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go7Ut0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go7UuEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go77wEriEeSRw9blU02bnQ" name="collapsedPort2" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go77wUriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go77wkriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go77wUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go77w0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go77xEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go77xUriEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go77xkriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go77x0riEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go77xkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go77yEriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go77yUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go8i0EriEeSRw9blU02bnQ" name="collapsedPort1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go8i0UriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go8i0kriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go8i0UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go8i00riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go8i1EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go8i1UriEeSRw9blU02bnQ" name="Port5" incomingEdges="_GpFFs0riEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go8i1kriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go8i10riEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go8i1kriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go8i2EriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go8i2UriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go9J4EriEeSRw9blU02bnQ" name="Port6" incomingEdges="_GpFswkriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go9J4UriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go9J4kriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go9J4UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go9J40riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go9J5EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_Go44cEriEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go44cUriEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go44ckriEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_Go44c0riEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']"/>
       </ownedDiagramElements>
@@ -10072,129 +9064,93 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go9w8EriEeSRw9blU02bnQ" name="Port1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go9w8UriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go9w8kriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go9w8UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go9w80riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go9w9EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go9w9UriEeSRw9blU02bnQ" name="Port2" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go9w9kriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go9w90riEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go9w9kriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go9w-EriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go9w-UriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go9w-kriEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go-YAEriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go-YAUriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go-YAEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go-YAkriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go-YA0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go-YBEriEeSRw9blU02bnQ" name="Port4" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go-YBUriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go-YBkriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go-YBUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go-YB0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go-YCEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go-YCUriEeSRw9blU02bnQ" name="Port5" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go-_EEriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go-_EUriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go-_EEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go-_EkriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go-_E0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go-_FEriEeSRw9blU02bnQ" name="Port6" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go-_FUriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go-_FkriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go-_FUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go-_F0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go-_GEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go-_GUriEeSRw9blU02bnQ" name="Port8" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go_mIEriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go_mIUriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go_mIEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go_mIkriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go_mI0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go_mJEriEeSRw9blU02bnQ" name="Port9" incomingEdges="_GpEeoEriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go_mJUriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go_mJkriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go_mJUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go_mJ0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go_mKEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Go_mKUriEeSRw9blU02bnQ" name="collapsePort3" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go_mKkriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go_mK0riEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Go_mKkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go_mLEriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Go_mLUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_GpANMEriEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpANMUriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_GpANMkriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpANMUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_GpANM0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_GpANNEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_GpANNUriEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpANNkriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_GpANN0riEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpANNkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_GpANOEriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_GpANOUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_Go44dUriEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go44dkriEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go44d0riEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_Go44eEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']"/>
       </ownedDiagramElements>
@@ -10204,63 +9160,45 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_GpA0QEriEeSRw9blU02bnQ" name="Port1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpA0QUriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_GpA0QkriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpA0QUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_GpA0Q0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_GpA0REriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_GpA0RUriEeSRw9blU02bnQ" name="Port2" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpBbUEriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_GpBbUUriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpBbUEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_GpBbUkriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_GpBbU0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_GpBbVEriEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpBbVUriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_GpBbVkriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpBbVUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_GpBbV0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_GpBbWEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_GpBbWUriEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpBbWkriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_GpBbW0riEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpBbWkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_GpBbXEriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_GpBbXUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_GpCCYEriEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpCCYUriEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_GpCCYkriEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GpCCYUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_GpCCY0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_GpCCZEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_Go44ekriEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Go44e0riEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Go44fEriEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_Go44fUriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']"/>
       </ownedDiagramElements>
@@ -10269,7 +9207,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M4v_4ErVEeSRw9blU02bnQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_GpEeoUriEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_GpEeokriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -10278,7 +9215,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_BgK4kMT4EeCCRJc48YB8Ug"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_GpFFsUriEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_GpFFskriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -10287,7 +9223,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_GpFswEriEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_GpFswUriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -10296,7 +9231,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_s84zwkpyEeSU7I_GWuX6JQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_GpFsw0riEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_GpFsxEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -11041,26 +9975,22 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4GyENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4GyUNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4l2gMJjJEeCGbO5oLE72PQ" visible="false">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4l3uUJjJEeCGbO5oLE72PQ" name="DropPort" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4l4VYJjJEeCGbO5oLE72PQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4l4VYZjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4l4VYJjJEeCGbO5oLE72PQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4l4VYpjJEeCGbO5oLE72PQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_59-agnViEd-KTclN5jfG4g" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4l3HQJjJEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4l3HQZjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4l3HQJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4l3HQpjJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4l3HQ5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4l3HRJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']"/>
       </ownedDiagramElements>
@@ -11070,119 +10000,85 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_pKrv4MUBEeCCRJc48YB8Ug" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_pKsW8MUBEeCCRJc48YB8Ug" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_pKsW8cUBEeCCRJc48YB8Ug"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_pKsW8MUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_pKsW8sUBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_pKsW88UBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_pKs-AMUBEeCCRJc48YB8Ug" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_pKs-AcUBEeCCRJc48YB8Ug" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_pKs-AsUBEeCCRJc48YB8Ug"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_pKs-AcUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_pKs-A8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_pKs-BMUBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UMGsEreEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UMGsUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UMtwEreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UMGsUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UMtwUreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UMtwkreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UMtw0reEeSRw9blU02bnQ" name="Port7" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UMtxEreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UMtxUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UMtxEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UMtxkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UMtx0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UMtyEreEeSRw9blU02bnQ" name="collapsedPortToMove1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UNU0EreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UNU0UreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UNU0EreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UNU0kreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UNU00reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UNU1EreEeSRw9blU02bnQ" name="collapsedPort2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UNU1UreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UNU1kreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UNU1UreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UNU10reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UNU2EreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UN74EreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UN74UreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UN74kreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UN74UreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UN740reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UN75EreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UN75UreEeSRw9blU02bnQ" name="collapsedPort1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UN75kreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UN750reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UN75kreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UN76EreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UN76UreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UOi8EreEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UOi8UreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UOi8kreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UOi8UreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UOi80reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UOi9EreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UOi9UreEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UOi9kreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UOi90reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UOi9kreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UOi-EreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UOi-UreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_pKrI0cUBEeCCRJc48YB8Ug">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_pKrI0sUBEeCCRJc48YB8Ug"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_pKrI0cUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_pKrI08UBEeCCRJc48YB8Ug"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_pKrI1MUBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_pKrI1cUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']"/>
       </ownedDiagramElements>
@@ -11192,130 +10088,93 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UFZBkreEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UGAEEreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UGAEUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UGAEEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UGAEkreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UGAE0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UGAFEreEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UGAFUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UGAFkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UGAFUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UGAF0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UGAGEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UGnIEreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UGnIUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UGnIkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UGnIUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UGnI0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UGnJEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UGnJUreEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UGnJkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UGnJ0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UGnJkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UGnKEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UGnKUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UHOMEreEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UHOMUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UHOMkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UHOMUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UHOM0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UHONEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UHONUreEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UHONkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UHON0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UHONkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UHOOEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UHOOUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UH1QEreEeSRw9blU02bnQ" name="Port8" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UH1QUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UH1QkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UH1QUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UH1Q0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UH1REreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UIcUEreEeSRw9blU02bnQ" name="Port9" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UIcUUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UIcUkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UIcUUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UIcU0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UIcVEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UIcVUreEeSRw9blU02bnQ" name="collapsePort3" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UIcVkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UIcV0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UIcVkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UIcWEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UIcWUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UJDYEreEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UJDYUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UJDYkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UJDYUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UJDY0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UJDZEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UJDZUreEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UJDZkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UJDZ0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UJDZkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UJDaEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UJDaUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_3UEx8UreEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UEx8kreEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_3UEx8UreEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UEx80reEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_3UEx9EreEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_3UEx9UreEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']"/>
       </ownedDiagramElements>
@@ -11325,64 +10184,45 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UJqcEreEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UJqcUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UJqckreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UJqcUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UJqc0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UJqdEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UKRgEreEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UKRgUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UKRgkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UKRgUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UKRg0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UKRhEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UK4kEreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UK4kUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UK4kkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UK4kUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UK4k0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UK4lEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3UK4lUreEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UK4lkreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UK4l0reEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3UK4lkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UK4mEreEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3UK4mUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_3ULfoEreEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3ULfoUreEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3ULfokreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3ULfoUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3ULfo0reEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_3ULfpEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_3UFZAUreEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_3UFZAkreEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_3UFZAUreEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_3UFZA0reEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_3UFZBEreEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_3UFZBUreEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']"/>
       </ownedDiagramElements>
@@ -11395,20 +10235,13 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huRm0UrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huRm0krhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huRm0UrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huRm00rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huRm1ErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_huPxoUrhEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huPxokrhEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_huPxoUrhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huPxo0rhEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_huPxpErhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_huPxpUrhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']"/>
       </ownedDiagramElements>
@@ -11418,119 +10251,85 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huSN4ErhEeSRw9blU02bnQ" name="Port1" outgoingEdges="_huebIErhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huSN4UrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huSN4krhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huSN4UrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huSN40rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huSN5ErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huSN5UrhEeSRw9blU02bnQ" name="Port4" outgoingEdges="_hufCMErhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huSN5krhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huSN50rhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huSN5krhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huSN6ErhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huSN6UrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huS08ErhEeSRw9blU02bnQ" name="Port7" outgoingEdges="_hufCM0rhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huS08UrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huS08krhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huS08UrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huS080rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huS09ErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huS09UrhEeSRw9blU02bnQ" name="Port2" incomingEdges="_huebIErhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huS09krhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huS090rhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huS09krhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huS0-ErhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huS0-UrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huTcAErhEeSRw9blU02bnQ" name="collapsedPortToMove1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huTcAUrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huTcAkrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huTcAUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huTcA0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huTcBErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huTcBUrhEeSRw9blU02bnQ" name="collapsedPort2" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huTcBkrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huTcB0rhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huTcBkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huTcCErhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huTcCUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huUDEErhEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huUDEUrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huUDEkrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huUDEUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huUDE0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huUDFErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huUDFUrhEeSRw9blU02bnQ" name="collapsedPort1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huUDFkrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huUDF0rhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huUDFkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huUDGErhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huUDGUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huUqIErhEeSRw9blU02bnQ" name="Port5" incomingEdges="_hufCMErhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huUqIUrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huUqIkrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huUqIUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huUqI0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huUqJErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huUqJUrhEeSRw9blU02bnQ" name="Port6" incomingEdges="_hufCM0rhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huUqJkrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huUqJ0rhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huUqJkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huUqKErhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huUqKUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_huQYsUrhEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huQYskrhEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_huQYsUrhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huQYs0rhEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_huQYtErhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_huQYtUrhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']"/>
       </ownedDiagramElements>
@@ -11540,130 +10339,93 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huVRMErhEeSRw9blU02bnQ" name="Port1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huVRMUrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huVRMkrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huVRMUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huVRM0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huVRNErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huV4QErhEeSRw9blU02bnQ" name="Port2" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huV4QUrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huV4QkrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huV4QUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huV4Q0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huV4RErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huV4RUrhEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huV4RkrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huV4R0rhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huV4RkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huV4SErhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huV4SUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huWfUErhEeSRw9blU02bnQ" name="Port4" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huWfUUrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huWfUkrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huWfUUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huWfU0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huWfVErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huWfVUrhEeSRw9blU02bnQ" name="Port5" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huXGYErhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huXGYUrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huXGYErhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huXGYkrhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huXGY0rhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huXtcErhEeSRw9blU02bnQ" name="Port6" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huYUgErhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huYUgUrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huYUgErhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huYUgkrhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huYUg0rhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huYUhErhEeSRw9blU02bnQ" name="Port8" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huYUhUrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huYUhkrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huYUhUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huYUh0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huYUiErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huYUiUrhEeSRw9blU02bnQ" name="Port9" incomingEdges="_hud0EErhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huY7kErhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huY7kUrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huY7kErhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huY7kkrhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huY7k0rhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huY7lErhEeSRw9blU02bnQ" name="collapsePort3" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huY7lUrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huY7lkrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huY7lUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huY7l0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huY7mErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huY7mUrhEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huZioErhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huZioUrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huZioErhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huZiokrhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huZio0rhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huZipErhEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huZipUrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huZipkrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huZipUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huZip0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huZiqErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_huQ_wErhEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huQ_wUrhEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_huQ_wErhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huQ_wkrhEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_huQ_w0rhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_huQ_xErhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']"/>
       </ownedDiagramElements>
@@ -11673,64 +10435,45 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huaJsErhEeSRw9blU02bnQ" name="Port1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huaJsUrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huaJskrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huaJsUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huaJs0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huaJtErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huaJtUrhEeSRw9blU02bnQ" name="Port2" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huaJtkrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huaJt0rhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huaJtkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huaJuErhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huaJuUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huawwErhEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huawwUrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huawwkrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huawwUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huaww0rhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huawxErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huawxUrhEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huawxkrhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huawx0rhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_huawxkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huawyErhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_huawyUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_huawykrhEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_hubX0ErhEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_hubX0UrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_hubX0ErhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_hubX0krhEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_hubX00rhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_huQ_xkrhEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huQ_x0rhEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_huQ_xkrhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huQ_yErhEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_huQ_yUrhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_huQ_ykrhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']"/>
       </ownedDiagramElements>
@@ -11739,7 +10482,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M4v_4ErVEeSRw9blU02bnQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_hud0EUrhEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_hud0EkrhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -11748,7 +10490,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_BgK4kMT4EeCCRJc48YB8Ug"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_huebIUrhEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_huebIkrhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -11757,7 +10498,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_hufCMUrhEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_hufCMkrhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -11766,7 +10506,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_s84zwkpyEeSU7I_GWuX6JQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_hufpQErhEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_hufpQUrhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -12643,15 +11382,14 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4GykNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4Gy0NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4mEioJjJEeCGbO5oLE72PQ" visible="false">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4mFJsJjJEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4mFJsZjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4mFJsJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4mFJspjJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4mFJs5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4mFJtJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_4mLQUJjJEeCGbO5oLE72PQ" visible="false" width="10" height="10" resizeKind="EAST_WEST">
@@ -12660,19 +11398,13 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4mPhwJjJEeCGbO5oLE72PQ" name="DropPort" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4mR-AJjJEeCGbO5oLE72PQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4mR-AZjJEeCGbO5oLE72PQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4mR-AJjJEeCGbO5oLE72PQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4mR-ApjJEeCGbO5oLE72PQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_8vKIsXViEd-KTclN5jfG4g" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_4mL3YJjJEeCGbO5oLE72PQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4mL3YZjJEeCGbO5oLE72PQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4mL3YpjJEeCGbO5oLE72PQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_4mL3Y5jJEeCGbO5oLE72PQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']"/>
         </ownedDiagramElements>
@@ -12680,12 +11412,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_rwUVYMUBEeCCRJc48YB8Ug" visible="false">
         <target xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rwU8cMUBEeCCRJc48YB8Ug">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rwU8ccUBEeCCRJc48YB8Ug"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rwU8cMUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rwU8csUBEeCCRJc48YB8Ug"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rwU8c8UBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rwU8dMUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_rwVjgMUBEeCCRJc48YB8Ug" visible="false" width="10" height="10" resizeKind="EAST_WEST">
@@ -12694,41 +11422,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_rwXYsMUBEeCCRJc48YB8Ug" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_rwX_wMUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rwX_wcUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_rwX_wMUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rwX_wsUBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_rwX_w8UBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_SbEGAEriEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbEGAUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbEGAkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbEGAUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbEGA0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbEGBEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_SbEtEEriEeSRw9blU02bnQ" name="Port7" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbEtEUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbEtEkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbEtEUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbEtE0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbEtFEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_rwVjgcUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rwVjgsUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rwVjg8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_rwVjhMUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']"/>
         </ownedDiagramElements>
@@ -12738,52 +11454,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_rwYm0MUBEeCCRJc48YB8Ug" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_rwYm0cUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rwYm0sUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_rwYm0cUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rwYm08UBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_rwYm1MUBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_SbFUIEriEeSRw9blU02bnQ" name="collapsedPortToMove1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbFUIUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbFUIkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbFUIUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbFUI0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbFUJEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_SbFUJUriEeSRw9blU02bnQ" name="collapsedPort2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbF7MEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbF7MUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbF7MEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbF7MkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbF7M0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_SbF7NEriEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbF7NUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbF7NkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbF7NUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbF7N0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbF7OEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_rwWKkcUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rwWKksUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rwWKk8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_rwWKlMUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']"/>
         </ownedDiagramElements>
@@ -12793,41 +11494,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_SbGiQEriEeSRw9blU02bnQ" name="collapsedPort1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbHJUEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbHJUUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbHJUEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbHJUkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbHJU0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_SbHJVEriEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbHJVUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbHJVkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbHJVUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbHJV0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbHJWEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_SbHwYEriEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbHwYUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbHwYkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbHwYUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbHwY0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbHwZEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_rwWxocUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rwWxosUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rwWxo8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_rwWxpMUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']"/>
         </ownedDiagramElements>
@@ -12835,12 +11524,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_Sa34wEriEeSRw9blU02bnQ" visible="false">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Sa34wUriEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa34wkriEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Sa34wUriEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa34w0riEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa34xEriEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa34xUriEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_Sa5G4EriEeSRw9blU02bnQ" visible="false" width="10" height="10" resizeKind="EAST_WEST">
@@ -12849,129 +11534,93 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Sa5t8EriEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa6VAEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa6VAUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa6VAEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa6VAkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa6VA0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Sa6VBEriEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa68EEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa68EUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa68EEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa68EkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa68E0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Sa68FEriEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa68FUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa68FkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa68FUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa68F0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa68GEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Sa7jIEriEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa7jIUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa7jIkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa7jIUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa7jI0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa7jJEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Sa8KMEriEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa8KMUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa8KMkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa8KMUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa8KM0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa8KNEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Sa8KNUriEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa8xQEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa8xQUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa8xQEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa8xQkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa8xQ0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Sa8xREriEeSRw9blU02bnQ" name="Port8" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa9YUEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa9YUUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa9YUEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa9YUkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa9YU0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Sa9YVEriEeSRw9blU02bnQ" name="Port9" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa9YVUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa9YVkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa9YVUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa9YV0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa9YWEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Sa9_YEriEeSRw9blU02bnQ" name="collapsePort3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa9_YUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa9_YkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa9_YUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa9_Y0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa9_ZEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Sa-mcEriEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa-mcUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa-mckriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa-mcUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa-mc0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa-mdEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Sa-mdUriEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa_NgEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa_NgUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Sa_NgEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa_NgkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa_Ng0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_Sa5G4UriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa5G4kriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa5G40riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa5G5EriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']"/>
         </ownedDiagramElements>
@@ -12979,12 +11628,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_Sa4f0EriEeSRw9blU02bnQ" visible="false">
         <target xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Sa4f0UriEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa4f0kriEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Sa4f0UriEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa4f00riEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa4f1EriEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa4f1UriEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_Sa_0kEriEeSRw9blU02bnQ" visible="false" width="10" height="10" resizeKind="EAST_WEST">
@@ -12993,63 +11638,45 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Sa_0lUriEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbAboEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbAboUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbAboEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbAbokriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbAbo0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_SbAbpEriEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbAbpUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbAbpkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbAbpUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbAbp0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbAbqEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_SbBCsEriEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbBCsUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbBCskriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbBCsUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbBCs0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbBCtEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_SbBpwEriEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbBpwUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbBpwkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbBpwUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbBpw0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbBpxEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_SbBpxUriEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbBpxkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_SbBpx0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SbBpxkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_SbBpyEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_SbBpyUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_Sa_0kUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa_0kkriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Sa_0k0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Sa_0lEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']"/>
         </ownedDiagramElements>
@@ -13057,12 +11684,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_dAmhUEriEeSRw9blU02bnQ">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_dAnIYEriEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnIYUriEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_dAnIYEriEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnIYkriEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnIY0riEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnIZEriEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_dAoWgEriEeSRw9blU02bnQ" width="10" height="10" resizeKind="EAST_WEST">
@@ -13074,19 +11697,13 @@
             <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
             <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
             <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAo9kUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAo9kkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAo9kUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAo9k0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAo9lEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_dAoWgUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAoWgkriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAoWg0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_dAoWhEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']"/>
         </ownedDiagramElements>
@@ -13094,12 +11711,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_dAnIZUriEeSRw9blU02bnQ">
         <target xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_dAnIZkriEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnIZ0riEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_dAnIZkriEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnIaEriEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnIaUriEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnIakriEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_dAo9lUriEeSRw9blU02bnQ" width="10" height="10" resizeKind="EAST_WEST">
@@ -13108,41 +11721,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAqLtEriEeSRw9blU02bnQ" name="Port1" outgoingEdges="_dA41MkriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAqywEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAqywUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAqywEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAqywkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAqyw0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAqyxEriEeSRw9blU02bnQ" name="Port4" outgoingEdges="_dA5cQkriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAqyxUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAqyxkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAqyxUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAqyx0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAqyyEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dArZ0EriEeSRw9blU02bnQ" name="Port7" outgoingEdges="_dA6DUEriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dArZ0UriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dArZ0kriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dArZ0UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dArZ00riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dArZ1EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_dApkoEriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dApkoUriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dApkokriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_dApko0riEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']"/>
         </ownedDiagramElements>
@@ -13152,52 +11753,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dArZ1UriEeSRw9blU02bnQ" name="Port2" incomingEdges="_dA41MkriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAsA4EriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAsA4UriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAsA4EriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAsA4kriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAsA40riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAsA5EriEeSRw9blU02bnQ" name="collapsedPortToMove1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAsA5UriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAsA5kriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAsA5UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAsA50riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAsA6EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAsA6UriEeSRw9blU02bnQ" name="collapsedPort2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAsn8EriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAsn8UriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAsn8EriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAsn8kriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAsn80riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAsn9EriEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAsn9UriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAsn9kriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAsn9UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAsn90riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAsn-EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_dApkpUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dApkpkriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dApkp0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_dApkqEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']"/>
         </ownedDiagramElements>
@@ -13207,41 +11793,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAtPAEriEeSRw9blU02bnQ" name="collapsedPort1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAtPAUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAtPAkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAtPAUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAtPA0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAtPBEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAtPBUriEeSRw9blU02bnQ" name="Port5" incomingEdges="_dA5cQkriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAt2EEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAt2EUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAt2EEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAt2EkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAt2E0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAt2FEriEeSRw9blU02bnQ" name="Port6" incomingEdges="_dA6DUEriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAt2FUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAt2FkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAt2FUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAt2F0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAt2GEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_dAqLsEriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAqLsUriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAqLskriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_dAqLs0riEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']"/>
         </ownedDiagramElements>
@@ -13249,12 +11823,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_dAnvcEriEeSRw9blU02bnQ">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_dAnvcUriEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnvckriEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_dAnvcUriEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnvc0riEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnvdEriEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnvdUriEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_dAudIEriEeSRw9blU02bnQ" width="10" height="10" resizeKind="EAST_WEST">
@@ -13263,129 +11833,93 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAvEMEriEeSRw9blU02bnQ" name="Port1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAvEMUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAvEMkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAvEMUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAvEM0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAvENEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAvENUriEeSRw9blU02bnQ" name="Port2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAvENkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAvEN0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAvENkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAvEOEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAvEOUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAvrQEriEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAvrQUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAvrQkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAvrQUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAvrQ0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAvrREriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAvrRUriEeSRw9blU02bnQ" name="Port4" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAwSUEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAwSUUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAwSUEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAwSUkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAwSU0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAwSVEriEeSRw9blU02bnQ" name="Port5" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAwSVUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAwSVkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAwSVUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAwSV0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAwSWEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAw5YEriEeSRw9blU02bnQ" name="Port6" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAw5YUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAw5YkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAw5YUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAw5Y0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAw5ZEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAw5ZUriEeSRw9blU02bnQ" name="Port8" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAw5ZkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAw5Z0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAw5ZkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAw5aEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAw5aUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAxgcEriEeSRw9blU02bnQ" name="Port9" incomingEdges="_dA4OIEriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAxgcUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAxgckriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAxgcUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAxgc0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAxgdEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAxgdUriEeSRw9blU02bnQ" name="collapsePort3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAxgdkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAxgd0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAxgdkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAxgeEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAxgeUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAyHgEriEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAyHgUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAyHgkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAyHgUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAyHg0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAyHhEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAyHhUriEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAyHhkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAyHh0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAyHhkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAyHiEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAyHiUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_dAudIUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAudIkriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAudI0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_dAudJEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']"/>
         </ownedDiagramElements>
@@ -13393,12 +11927,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_dAnvdkriEeSRw9blU02bnQ">
         <target xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_dAnvd0riEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnveEriEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_dAnvd0riEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnveUriEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnvekriEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_dAnve0riEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_dAyukEriEeSRw9blU02bnQ" width="10" height="10" resizeKind="EAST_WEST">
@@ -13407,63 +11937,45 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAzVoEriEeSRw9blU02bnQ" name="Port1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAzVoUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAzVokriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAzVoUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAzVo0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAzVpEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAz8sEriEeSRw9blU02bnQ" name="Port2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAz8sUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAz8skriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAz8sUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAz8s0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAz8tEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dAz8tUriEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAz8tkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAz8t0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dAz8tkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAz8uEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dAz8uUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dA0jwEriEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dA0jwUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dA0jwkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dA0jwUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dA0jw0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dA0jxEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dA0jxUriEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dA0jxkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dA0jx0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_dA0jxkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dA0jyEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_dA0jyUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_dAyukUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dAyukkriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dAyuk0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_dAyulEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']"/>
         </ownedDiagramElements>
@@ -13473,7 +11985,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M4v_4ErVEeSRw9blU02bnQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_dA41MEriEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_dA41MUriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -13482,7 +11993,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_BgK4kMT4EeCCRJc48YB8Ug"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_dA5cQEriEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_dA5cQUriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -13491,7 +12001,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_dA5cQ0riEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_dA5cREriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -13500,7 +12009,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_s84zwkpyEeSU7I_GWuX6JQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_dA6DUUriEeSRw9blU02bnQ" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_dA6DUkriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -14374,6 +12882,9 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4GzENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4GzUNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4mag4JjJEeCGbO5oLE72PQ" visible="false">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
@@ -14383,28 +12894,18 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4mhOkJjJEeCGbO5oLE72PQ" name="DropPort" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4mh1oJjJEeCGbO5oLE72PQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4mh1oZjJEeCGbO5oLE72PQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4mh1oJjJEeCGbO5oLE72PQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4mh1opjJEeCGbO5oLE72PQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_Cyx4AnVjEd-KTclN5jfG4g" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_4mgAcZjJEeCGbO5oLE72PQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4mgAcpjJEeCGbO5oLE72PQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4mgAc5jJEeCGbO5oLE72PQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_4mgAdJjJEeCGbO5oLE72PQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4meyUJjJEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4meyUZjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4meyUJjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4meyUpjJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4meyU5jJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4meyVJjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -14417,41 +12918,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_s1WDwMUBEeCCRJc48YB8Ug" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_s1Wq0MUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_s1Wq0cUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_s1Wq0MUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_s1Wq0sUBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_s1Wq08UBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYo9AEriEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYo9AUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYo9AkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYo9AUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYo9A0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYo9BEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYo9BUriEeSRw9blU02bnQ" name="Port7" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYo9BkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYo9B0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYo9BkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYo9CEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYo9CUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_s1UOkcUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_s1UOksUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_s1UOk8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_s1UOlMUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
@@ -14461,52 +12950,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_s1XR4MUBEeCCRJc48YB8Ug" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_s1XR4cUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_s1XR4sUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_s1XR4cUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_s1XR48UBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_s1XR5MUBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYpkEEriEeSRw9blU02bnQ" name="collapsedPortToMove1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYpkEUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYpkEkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYpkEUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYpkE0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYpkFEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYqLIEriEeSRw9blU02bnQ" name="collapsedPort2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYqLIUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYqLIkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYqLIUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYqLI0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYqLJEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYqLJUriEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYqyMEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYqyMUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYqyMEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYqyMkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYqyM0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_s1U1ocUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_s1U1osUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_s1U1o8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_s1U1pMUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
@@ -14516,50 +12990,34 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYqyNEriEeSRw9blU02bnQ" name="collapsedPort1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYrZQEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYrZQUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYrZQEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYrZQkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYrZQ0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYrZREriEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYrZRUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYrZRkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYrZRUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYrZR0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYrZSEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYrZSUriEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYsAUEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYsAUUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYsAUEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYsAUkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYsAU0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_s1VcscUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_s1VcssUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_s1Vcs8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_s1VctMUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_s1TngcUBEeCCRJc48YB8Ug">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_s1TngsUBEeCCRJc48YB8Ug"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_s1TngcUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_s1Tng8UBEeCCRJc48YB8Ug"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_s1TnhMUBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_s1TnhcUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -14572,138 +13030,98 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYiPUEriEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYiPUUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYiPUkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYiPUUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYiPU0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYiPVEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYiPVUriEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYiPVkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYiPV0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYiPVkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYiPWEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYiPWUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYi2YEriEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYi2YUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYi2YkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYi2YUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYi2Y0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYi2ZEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYi2ZUriEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYi2ZkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYi2Z0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYi2ZkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYi2aEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYi2aUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYjdcEriEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYjdcUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYjdckriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYjdcUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYjdc0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYjddEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYjddUriEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYjddkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYjdd0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYjddkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYjdeEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYjdeUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYkEgEriEeSRw9blU02bnQ" name="Port8" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYkEgUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYkEgkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYkEgUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYkEg0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYkEhEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYkEhUriEeSRw9blU02bnQ" name="Port9" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYkEhkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYkEh0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYkEhkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYkEiEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYkEiUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYkrkEriEeSRw9blU02bnQ" name="collapsePort3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYkrkUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYkrkkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYkrkUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYkrk0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYkrlEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYkrlUriEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYkrlkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYkrl0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYkrlkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYkrmEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYkrmUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYlSoEriEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYlSoUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYlSokriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYlSoUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYlSo0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYlSpEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_iYhoQUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYhoQkriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYhoQ0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_iYhoREriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iYhBMEriEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYhBMUriEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iYhBMEriEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYhBMkriEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iYhBM0riEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iYhBNEriEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -14716,72 +13134,50 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYl5tEriEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYl5tUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYl5tkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYl5tUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYl5t0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYl5uEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYmgwEriEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYmgwUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYmgwkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYmgwUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYmgw0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYmgxEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYmgxUriEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYmgxkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYmgx0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYmgxkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYmgyEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYmgyUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYmgykriEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYnH0EriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYnH0UriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYnH0EriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYnH0kriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYnH00riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_iYnH1EriEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYnH1UriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYnH1kriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_iYnH1UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYnH10riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_iYnH2EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@borderedNodeMappings[name='CDPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_iYl5sEriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYl5sUriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYl5skriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_iYl5s0riEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@borderedNodeMappings[name='CDPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iYhBNkriEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iYhBN0riEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iYhBNkriEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iYhBOEriEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iYhBOUriEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iYhBOkriEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -14797,28 +13193,18 @@
             <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
             <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
             <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o07D8UriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o07D8kriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o07D8UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o07D80riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o07D9EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_o06c5kriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o06c50riEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o06c6EriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_o06c6UriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_o05OwEriEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o05OwUriEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_o05OwEriEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o05OwkriEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_o05Ow0riEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_o05OxEriEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -14831,41 +13217,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o085IEriEeSRw9blU02bnQ" name="Port1" outgoingEdges="_umR-k0riEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o085IUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o085IkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o085IUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o085I0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o085JEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o085JUriEeSRw9blU02bnQ" name="Port4" outgoingEdges="_umSlokriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o085JkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o085J0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o085JkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o085KEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o085KUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o09gMEriEeSRw9blU02bnQ" name="Port7" outgoingEdges="_umSlpUriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o09gMUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o09gMkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o09gMUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o09gM0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o09gNEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_o07rAUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o07rAkriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o07rA0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_o07rBEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
@@ -14875,52 +13249,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o0-HQEriEeSRw9blU02bnQ" name="Port2" incomingEdges="_umR-k0riEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0-HQUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o0-HQkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0-HQUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o0-HQ0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o0-HREriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o0-HRUriEeSRw9blU02bnQ" name="collapsedPortToMove1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0-HRkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o0-HR0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0-HRkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o0-HSEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o0-HSUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o0-uUEriEeSRw9blU02bnQ" name="collapsedPort2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0-uUUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o0-uUkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0-uUUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o0-uU0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o0-uVEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o0-uVUriEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0-uVkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o0-uV0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0-uVkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o0-uWEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o0-uWUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_o08SEUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o08SEkriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o08SE0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_o08SFEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
@@ -14930,50 +13289,34 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o0_VYEriEeSRw9blU02bnQ" name="collapsedPort1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0_VYUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o0_VYkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0_VYUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o0_VY0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o0_VZEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o0_VZUriEeSRw9blU02bnQ" name="Port5" incomingEdges="_umSlokriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0_8cEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o0_8cUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0_8cEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o0_8ckriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o0_8c0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o0_8dEriEeSRw9blU02bnQ" name="Port6" incomingEdges="_umSlpUriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0_8dUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o0_8dkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o0_8dUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o0_8d0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o0_8eEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_o08SFkriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o08SF0riEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o08SGEriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_o08SGUriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_o05OxkriEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o05Ox0riEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_o05OxkriEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o05OyEriEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_o05OyUriEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_o05OykriEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -14986,138 +13329,98 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1AjhUriEeSRw9blU02bnQ" name="Port1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1AjhkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1Ajh0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1AjhkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1AjiEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1AjiUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1BKkEriEeSRw9blU02bnQ" name="Port2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1BKkUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1BKkkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1BKkUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1BKk0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1BKlEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1BKlUriEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1BKlkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1BKl0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1BKlkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1BKmEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1BKmUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1BxoEriEeSRw9blU02bnQ" name="Port4" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1BxoUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1BxokriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1BxoUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1Bxo0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1BxpEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1BxpUriEeSRw9blU02bnQ" name="Port5" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1BxpkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1Bxp0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1BxpkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1BxqEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1BxqUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1CYsEriEeSRw9blU02bnQ" name="Port6" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1CYsUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1CYskriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1CYsUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1CYs0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1CYtEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1CYtUriEeSRw9blU02bnQ" name="Port8" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1CYtkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1CYt0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1CYtkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1CYuEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1CYuUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1C_wEriEeSRw9blU02bnQ" name="Port9" incomingEdges="_umR-kEriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1C_wUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1C_wkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1C_wUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1C_w0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1C_xEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1C_xUriEeSRw9blU02bnQ" name="collapsePort3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1C_xkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1C_x0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1C_xkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1C_yEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1C_yUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1Dm0EriEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1Dm0UriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1Dm0kriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1Dm0UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1Dm00riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1Dm1EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1Dm1UriEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1Dm1kriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1Dm10riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1Dm1kriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1Dm2EriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1Dm2UriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_o1AjgUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1AjgkriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1Ajg0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_o1AjhEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_o0510UriEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o0510kriEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_o0510UriEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o05100riEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_o0511EriEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_o0511UriEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -15130,72 +13433,50 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1E08EriEeSRw9blU02bnQ" name="Port1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1E08UriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1E08kriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1E08UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1E080riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1E09EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1E09UriEeSRw9blU02bnQ" name="Port2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1FcAEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1FcAUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1FcAEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1FcAkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1FcA0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1FcBEriEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1FcBUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1FcBkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1FcBUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1FcB0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1FcCEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1FcCUriEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1GDEEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1GDEUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1GDEEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1GDEkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1GDE0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_o1GDFEriEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1GDFUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1GDFkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_o1GDFUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1GDF0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_o1GDGEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_o1EN4UriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o1EN4kriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o1EN40riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_o1EN5EriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_o06c4EriEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_o06c4UriEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_o06c4EriEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_o06c4kriEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_o06c40riEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_o06c5EriEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']"/>
       </ownedDiagramElements>
@@ -15204,7 +13485,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M4v_4ErVEeSRw9blU02bnQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_umR-kUriEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_umR-kkriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -15213,7 +13493,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_BgK4kMT4EeCCRJc48YB8Ug"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_umSloEriEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_umSloUriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -15222,7 +13501,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_umSlo0riEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_umSlpEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -15231,7 +13509,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_s84zwkpyEeSU7I_GWuX6JQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_umTMsEriEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_umTMsUriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -16121,6 +14398,9 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4GzkNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4Gz0NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_4mmHEJjJEeCGbO5oLE72PQ" visible="false" width="10" height="10" resizeKind="EAST_WEST">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
@@ -16130,27 +14410,18 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4mojUJjJEeCGbO5oLE72PQ" name="DropPort" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4mojUZjJEeCGbO5oLE72PQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4mojUpjJEeCGbO5oLE72PQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4mojUZjJEeCGbO5oLE72PQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4mojU5jJEeCGbO5oLE72PQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_FyE6sXVjEd-KTclN5jfG4g" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_4mnVMZjJEeCGbO5oLE72PQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4mnVMpjJEeCGbO5oLE72PQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4mnVM5jJEeCGbO5oLE72PQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_4mnVNJjJEeCGbO5oLE72PQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_4mmHEZjJEeCGbO5oLE72PQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4mmHEpjJEeCGbO5oLE72PQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4mmHE5jJEeCGbO5oLE72PQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_4mmHFJjJEeCGbO5oLE72PQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -16163,41 +14434,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_t8lYoMUBEeCCRJc48YB8Ug" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_t8lYocUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_t8lYosUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_t8lYocUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_t8lYo8UBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_t8lYpMUBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hgm4EriEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hgm4UriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hgm4kriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hgm4UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hgm40riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hgm5EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hgm5UriEeSRw9blU02bnQ" name="Port7" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hhN8EriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hhN8UriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hhN8EriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hhN8kriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hhN80riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_t8i8YcUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_t8i8YsUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_t8i8Y8UBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_t8i8ZMUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -16207,52 +14466,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_t8l_sMUBEeCCRJc48YB8Ug" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_t8mmwMUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_t8mmwcUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_t8mmwMUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_t8mmwsUBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_t8mmw8UBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hhN9EriEeSRw9blU02bnQ" name="collapsedPortToMove1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hhN9UriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hhN9kriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hhN9UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hhN90riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hhN-EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hh1AEriEeSRw9blU02bnQ" name="collapsedPort2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hh1AUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hh1AkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hh1AUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hh1A0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hh1BEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hh1BUriEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hh1BkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hh1B0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hh1BkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hh1CEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hh1CUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_t8jjccUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_t8kKgMUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_t8kKgcUBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_t8kKgsUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -16262,49 +14506,34 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hicEEriEeSRw9blU02bnQ" name="collapsedPort1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hicEUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hicEkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hicEUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hicE0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hicFEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hjDIEriEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hjDIUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hjDIkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hjDIUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hjDI0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hjDJEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hjDJUriEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hjDJkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hjDJ0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hjDJkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hjDKEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hjDKUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_t8kxkMUBEeCCRJc48YB8Ug" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_t8kxkcUBEeCCRJc48YB8Ug"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_t8kxksUBEeCCRJc48YB8Ug"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_t8kxk8UBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_t8iVUcUBEeCCRJc48YB8Ug" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_t8iVUsUBEeCCRJc48YB8Ug"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_t8iVU8UBEeCCRJc48YB8Ug"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_t8iVVMUBEeCCRJc48YB8Ug" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -16317,137 +14546,98 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hZ5MEriEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hZ5MUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hZ5MkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hZ5MUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hZ5M0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hZ5NEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hZ5NUriEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hZ5NkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hZ5N0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hZ5NkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hZ5OEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hZ5OUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hagQEriEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hagQUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hagQkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hagQUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hagQ0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hagREriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hagRUriEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hagRkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hagR0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hagRkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hagSEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hagSUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hbHUEriEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hbHUUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hbHUkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hbHUUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hbHU0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hbHVEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hbHVUriEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hbHVkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hbHV0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hbHVkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hbHWEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hbHWUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hbuYEriEeSRw9blU02bnQ" name="Port8" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hbuYUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hbuYkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hbuYUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hbuY0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hbuZEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hbuZUriEeSRw9blU02bnQ" name="Port9" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hbuZkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hbuZ0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hbuZkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hbuaEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hbuaUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hcVcEriEeSRw9blU02bnQ" name="collapsePort3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hcVcUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hcVckriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hcVcUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hcVc0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hcVdEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hc8gEriEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hc8gUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hc8gkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hc8gUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hc8g0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hc8hEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hc8hUriEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hc8hkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hc8h0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hc8hkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hc8iEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hc8iUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_0hZSJUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hZSJkriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hZSJ0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_0hZSKEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_0hYrEUriEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hYrEkriEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hYrE0riEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_0hYrFEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -16460,71 +14650,50 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hdjlUriEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0heKoEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0heKoUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0heKoEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0heKokriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0heKo0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0heKpEriEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0heKpUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0heKpkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0heKpUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0heKp0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0heKqEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0heKqUriEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hexsEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hexsUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hexsEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hexskriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hexs0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hextEriEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hextUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hextkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hextUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hext0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hexuEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_0hexuUriEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hfYwEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hfYwUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_0hfYwEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hfYwkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_0hfYw0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@borderedNodeMappings[name='CDPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_0hdjkUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hdjkkriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hdjk0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_0hdjlEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@borderedNodeMappings[name='CDPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_0hZSIEriEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0hZSIUriEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_0hZSIkriEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_0hZSI0riEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -16540,27 +14709,18 @@
             <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
             <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
             <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vq_kUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vq_kkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vq_kUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vq_k0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vq_lEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_9vqYgkriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vqYg0riEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vqYhEriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_9vqYhUriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_9vpKYUriEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vpKYkriEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vpKY0riEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_9vpKZEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -16573,41 +14733,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vsNsEriEeSRw9blU02bnQ" name="Port1" outgoingEdges="_9v4a80riEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vsNsUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vsNskriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vsNsUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vsNs0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vsNtEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vsNtUriEeSRw9blU02bnQ" name="Port4" outgoingEdges="_9v5CAEriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vsNtkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vs0wEriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vsNtkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vs0wUriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vs0wkriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vs0w0riEeSRw9blU02bnQ" name="Port7" outgoingEdges="_9v5CA0riEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vs0xEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vs0xUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vs0xEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vs0xkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vs0x0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_9vq_lkriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vq_l0riEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vq_mEriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_9vq_mUriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -16617,52 +14765,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vtb0EriEeSRw9blU02bnQ" name="Port2" incomingEdges="_9v4a80riEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vtb0UriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vtb0kriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vtb0UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vtb00riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vtb1EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vtb1UriEeSRw9blU02bnQ" name="collapsedPortToMove1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vtb1kriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vtb10riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vtb1kriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vtb2EriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vtb2UriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vuC4EriEeSRw9blU02bnQ" name="collapsedPort2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vuC4UriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vuC4kriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vuC4UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vuC40riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vuC5EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vuC5UriEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vuC5kriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vuC50riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vuC5kriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vuC6EriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vuC6UriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_9vrmoUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vrmokriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vrmo0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_9vrmpEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -16672,41 +14805,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vup8EriEeSRw9blU02bnQ" name="collapsedPort1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vup8UriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vup8kriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vup8UriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vup80riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vup9EriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vup9UriEeSRw9blU02bnQ" name="Port5" incomingEdges="_9v5CAEriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vup9kriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vup90riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vup9kriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vup-EriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vup-UriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vvRAEriEeSRw9blU02bnQ" name="Port6" incomingEdges="_9v5CA0riEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vvRAUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vvRAkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vvRAUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vvRA0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vvRBEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_9vrmpkriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vrmp0riEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vrmqEriEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_9vrmqUriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -16714,10 +14835,7 @@
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_9vpxcUriEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vpxckriEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vpxc0riEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_9vpxdEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -16730,121 +14848,88 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vv4FUriEeSRw9blU02bnQ" name="Port1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vv4FkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vv4F0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vv4FkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vv4GEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vv4GUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vwfIEriEeSRw9blU02bnQ" name="Port2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vwfIUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vwfIkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vwfIUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vwfI0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vwfJEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vwfJUriEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vwfJkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vwfJ0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vwfJkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vwfKEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vwfKUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vxGMEriEeSRw9blU02bnQ" name="Port4" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vxGMUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vxGMkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vxGMUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vxGM0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vxGNEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vxGNUriEeSRw9blU02bnQ" name="Port5" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vxGNkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vxGN0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vxGNkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vxGOEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vxGOUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vxtQEriEeSRw9blU02bnQ" name="Port6" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vxtQUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vxtQkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vxtQUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vxtQ0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vxtREriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vxtRUriEeSRw9blU02bnQ" name="Port8" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vxtRkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vxtR0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vxtRkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vxtSEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vxtSUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vyUUEriEeSRw9blU02bnQ" name="Port9" incomingEdges="_9v4a8EriEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vyUUUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vyUUkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vyUUUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vyUU0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vyUVEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vyUVUriEeSRw9blU02bnQ" name="collapsePort3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vyUVkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vyUV0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vyUVkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vyUWEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vyUWUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vy7YEriEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vy7YUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vy7YkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vy7YUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vy7Y0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vy7ZEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vy7ZUriEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vy7ZkriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vy7Z0riEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9vy7ZkriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vy7aEriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9vy7aUriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
@@ -16852,10 +14937,7 @@
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_9vv4EUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vv4EkriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vv4E0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_9vv4FEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -16863,10 +14945,7 @@
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_9vpxdkriEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vpxd0riEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vpxeEriEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_9vpxeUriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -16879,55 +14958,40 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9vzidUriEeSRw9blU02bnQ" name="Port1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9v0JgEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9v0JgUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9v0JgEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9v0JgkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9v0Jg0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9v0JhEriEeSRw9blU02bnQ" name="Port2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9v0JhUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9v0JhkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9v0JhUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9v0Jh0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9v0JiEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9v0JiUriEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9v0wkEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9v0wkUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9v0wkEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9v0wkkriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9v0wk0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9v0wlEriEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9v0wlUriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9v0wlkriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9v0wlUriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9v0wl0riEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9v0wmEriEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_9v0wmUriEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9v1XoEriEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9v1XoUriEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9v1XoEriEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9v1XokriEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_9v1Xo0riEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']"/>
           </ownedBorderedNodes>
@@ -16935,10 +14999,7 @@
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
           <ownedStyle xmi:type="diagram:Square" xmi:id="_9vzicUriEeSRw9blU02bnQ" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vzickriEeSRw9blU02bnQ"/>
             <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vzic0riEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_9vzidEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']"/>
         </ownedBorderedNodes>
@@ -16946,10 +15007,7 @@
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_9vpxe0riEeSRw9blU02bnQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9vpxfEriEeSRw9blU02bnQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_9vpxfUriEeSRw9blU02bnQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_9vqYgEriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']"/>
       </ownedDiagramElements>
@@ -16958,7 +15016,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M4v_4ErVEeSRw9blU02bnQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_9v4a8UriEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_9v4a8kriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -16967,7 +15024,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_BgK4kMT4EeCCRJc48YB8Ug"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_9v4a9EriEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_9v4a9UriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -16976,7 +15032,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_9v5CAUriEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_9v5CAkriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -16985,7 +15040,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_s84zwkpyEeSU7I_GWuX6JQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_9v5pEEriEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_9v5pEUriEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -17838,15 +15892,14 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G0ENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G0UNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4ms0wJjJEeCGbO5oLE72PQ" visible="false">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4ms0wZjJEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4ms0wpjJEeCGbO5oLE72PQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4ms0wZjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4ms0w5jJEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4ms0xJjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4ms0xZjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4mup8JjJEeCGbO5oLE72PQ" visible="false">
@@ -17855,20 +15908,13 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4mv4EJjJEeCGbO5oLE72PQ" name="DropPort" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4mwfIJjJEeCGbO5oLE72PQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4mwfIZjJEeCGbO5oLE72PQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4mwfIJjJEeCGbO5oLE72PQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4mwfIpjJEeCGbO5oLE72PQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_yxGnUHVmEd-pULyUSwl5Fg" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4mup8ZjJEeCGbO5oLE72PQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4mup8pjJEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4mup8ZjJEeCGbO5oLE72PQ" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4mup85jJEeCGbO5oLE72PQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4mup9JjJEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4mup9ZjJEeCGbO5oLE72PQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         </ownedDiagramElements>
@@ -17876,12 +15922,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_p6rpcMUBEeCCRJc48YB8Ug" visible="false">
         <target xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_p6rpccUBEeCCRJc48YB8Ug">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_p6rpcsUBEeCCRJc48YB8Ug"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_p6rpccUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_p6rpc8UBEeCCRJc48YB8Ug"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_p6rpdMUBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_p6rpdcUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_p6sQgMUBEeCCRJc48YB8Ug" visible="false">
@@ -17890,42 +15932,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_p6uswMUBEeCCRJc48YB8Ug" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_p6uswcUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_p6uswsUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_p6uswcUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_p6usw8UBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_p6usxMUBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PWucEreEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PWucUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PWuckreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PWucUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PWuc0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PWudEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PWudUreEeSRw9blU02bnQ" name="Port7" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PWudkreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PWud0reEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PWudkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PWueEreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PWueUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_p6s3kMUBEeCCRJc48YB8Ug">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_p6s3kcUBEeCCRJc48YB8Ug"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_p6s3kMUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_p6s3ksUBEeCCRJc48YB8Ug"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_p6s3k8UBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_p6s3lMUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         </ownedDiagramElements>
@@ -17935,53 +15964,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_p6v64MUBEeCCRJc48YB8Ug" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_p6v64cUBEeCCRJc48YB8Ug" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_p6v64sUBEeCCRJc48YB8Ug"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_p6v64cUBEeCCRJc48YB8Ug" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_p6v648UBEeCCRJc48YB8Ug"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_p6v65MUBEeCCRJc48YB8Ug" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PXVgEreEeSRw9blU02bnQ" name="collapsedPortToMove1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PX8kEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PX8kUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PX8kEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PX8kkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PX8k0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PX8lEreEeSRw9blU02bnQ" name="collapsedPort2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PX8lUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PX8lkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PX8lUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PX8l0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PX8mEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PYjoEreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PYjoUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PYjokreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PYjoUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PYjo0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PYjpEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_p6teocUBEeCCRJc48YB8Ug">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_p6teosUBEeCCRJc48YB8Ug"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_p6teocUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_p6teo8UBEeCCRJc48YB8Ug"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_p6tepMUBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_p6tepcUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         </ownedDiagramElements>
@@ -17991,42 +16004,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PZKsEreEeSRw9blU02bnQ" name="collapsedPort1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PZKsUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PZKskreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PZKsUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PZKs0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PZKtEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PZKtUreEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PZxwEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PZxwUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PZxwEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PZxwkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PZxw0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PZxxEreEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PZxxUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PZxxkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PZxxUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PZxx0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PZxyEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_p6uFscUBEeCCRJc48YB8Ug">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_p6uFssUBEeCCRJc48YB8Ug"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_p6uFscUBEeCCRJc48YB8Ug" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_p6uFs8UBEeCCRJc48YB8Ug"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_p6uFtMUBEeCCRJc48YB8Ug" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_p6uFtcUBEeCCRJc48YB8Ug" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         </ownedDiagramElements>
@@ -18034,12 +16034,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4PM9cEreEeSRw9blU02bnQ" visible="false">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4PM9cUreEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PM9ckreEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4PM9cUreEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PM9c0reEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4PM9dEreEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4PM9dUreEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4PNkhkreEeSRw9blU02bnQ" visible="false">
@@ -18048,130 +16044,93 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4POLlUreEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4POLlkreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4POLl0reEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4POLlkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4POLmEreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4POLmUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4POyoEreEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4POyoUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4POyokreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4POyoUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4POyo0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4POypEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4POypUreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4POypkreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4POyp0reEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4POypkreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4POyqEreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4POyqUreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PPZsEreEeSRw9blU02bnQ" name="Port4" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PPZsUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PPZskreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PPZsUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PPZs0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PPZtEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PPZtUreEeSRw9blU02bnQ" name="Port5" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PQAwEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PQAwUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PQAwEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PQAwkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PQAw0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PQAxEreEeSRw9blU02bnQ" name="Port6" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PQAxUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PQAxkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PQAxUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PQAx0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PQAyEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PQAyUreEeSRw9blU02bnQ" name="Port8" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PQn0EreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PQn0UreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PQn0EreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PQn0kreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PQn00reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PQn1EreEeSRw9blU02bnQ" name="Port9" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PQn1UreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PQn1kreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PQn1UreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PQn10reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PQn2EreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PQn2UreEeSRw9blU02bnQ" name="collapsePort3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PRO4EreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PRO4UreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PRO4EreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PRO4kreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PRO40reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PRO5EreEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PRO5UreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PRO5kreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PRO5UreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PRO50reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PRO6EreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PRO6UreEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PR18EreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PR18UreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PR18EreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PR18kreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PR180reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4POLkEreEeSRw9blU02bnQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4POLkUreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4POLkEreEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4POLkkreEeSRw9blU02bnQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4POLk0reEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4POLlEreEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         </ownedDiagramElements>
@@ -18179,12 +16138,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4PNkgEreEeSRw9blU02bnQ" visible="false">
         <target xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4PNkgUreEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PNkgkreEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4PNkgUreEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PNkg0reEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4PNkhEreEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4PNkhUreEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_4PSdAEreEeSRw9blU02bnQ" visible="false">
@@ -18193,64 +16148,45 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PSdBkreEeSRw9blU02bnQ" name="Port1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PTEEEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PTEEUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PTEEEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PTEEkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PTEE0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PTEFEreEeSRw9blU02bnQ" name="Port2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PTEFUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PTEFkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PTEFUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PTEF0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PTEGEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PTEGUreEeSRw9blU02bnQ" name="Port3" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PTrIEreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PTrIUreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PTrIEreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PTrIkreEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PTrI0reEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PTrJEreEeSRw9blU02bnQ" name="collapsePort1" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PTrJUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PTrJkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PTrJUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PTrJ0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PTrKEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_4PUSMEreEeSRw9blU02bnQ" name="collapsePort2" visible="false" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PUSMUreEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PUSMkreEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_4PUSMUreEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PUSM0reEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_4PUSNEreEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4PSdAUreEeSRw9blU02bnQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4PSdAkreEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_4PSdAUreEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_4PSdA0reEeSRw9blU02bnQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4PSdBEreEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_4PSdBUreEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"/>
         </ownedDiagramElements>
@@ -18258,12 +16194,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_6ZPEsErhEeSRw9blU02bnQ">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZPEsUrhEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPEskrhEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZPEsUrhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPEs0rhEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPEtErhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPEtUrhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_6ZQS0ErhEeSRw9blU02bnQ" name="InnerComponent">
@@ -18275,20 +16207,13 @@
             <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
             <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
             <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZQ54UrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZQ54krhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZQ54UrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZQ540rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZQ55ErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZQS0UrhEeSRw9blU02bnQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZQS0krhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZQS0UrhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZQS00rhEeSRw9blU02bnQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZQS1ErhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZQS1UrhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']"/>
         </ownedDiagramElements>
@@ -18296,12 +16221,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_6ZPEtkrhEeSRw9blU02bnQ">
         <target xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZPrwErhEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPrwUrhEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZPrwErhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPrwkrhEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPrw0rhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPrxErhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_6ZRg8ErhEeSRw9blU02bnQ">
@@ -18310,42 +16231,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZSIBkrhEeSRw9blU02bnQ" name="Port1" outgoingEdges="_6ZfjYkrhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZSIB0rhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZSICErhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZSIB0rhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZSICUrhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZSICkrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZSvEErhEeSRw9blU02bnQ" name="Port4" outgoingEdges="_6ZgKcErhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_deL3cEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZSvEUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZSvEkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZSvEUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZSvE0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZSvFErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZSvFUrhEeSRw9blU02bnQ" name="Port7" outgoingEdges="_6ZgKc0rhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZSvFkrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZSvF0rhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZSvFkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZSvGErhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZSvGUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZRg8UrhEeSRw9blU02bnQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZRg8krhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZRg8UrhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZRg80rhEeSRw9blU02bnQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZRg9ErhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZRg9UrhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']"/>
         </ownedDiagramElements>
@@ -18355,53 +16263,37 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZTWIErhEeSRw9blU02bnQ" name="Port2" incomingEdges="_6ZfjYkrhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZTWIUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZTWIkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZTWIUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZTWI0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZTWJErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZT9MErhEeSRw9blU02bnQ" name="collapsedPortToMove1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZT9MUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZT9MkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZT9MUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZT9M0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZT9NErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZT9NUrhEeSRw9blU02bnQ" name="collapsedPort2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZT9NkrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZT9N0rhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZT9NkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZT9OErhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZT9OUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZUkQErhEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZUkQUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZUkQkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZUkQUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZUkQ0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZUkRErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZRg90rhEeSRw9blU02bnQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZRg-ErhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZRg90rhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZRg-UrhEeSRw9blU02bnQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZRg-krhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZRg-0rhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']"/>
         </ownedDiagramElements>
@@ -18411,42 +16303,29 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZVLUErhEeSRw9blU02bnQ" name="collapsedPort1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZVLUUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZVLUkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZVLUUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZVLU0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZVLVErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZVLVUrhEeSRw9blU02bnQ" name="Port5" incomingEdges="_6ZgKcErhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_VNNfwEotEeSUzKpYpQxHZQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZVLVkrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZVLV0rhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZVLVkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZVLWErhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZVLWUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZVyYErhEeSRw9blU02bnQ" name="Port6" incomingEdges="_6ZgKc0rhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZVyYUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZVyYkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZVyYUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZVyY0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZVyZErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZSIAUrhEeSRw9blU02bnQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZSIAkrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZSIAUrhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZSIA0rhEeSRw9blU02bnQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZSIBErhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZSIBUrhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']"/>
         </ownedDiagramElements>
@@ -18454,12 +16333,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_6ZPrxUrhEeSRw9blU02bnQ">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZPrxkrhEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPrx0rhEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZPrxkrhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPryErhEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPryUrhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPrykrhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_6ZWZcErhEeSRw9blU02bnQ">
@@ -18468,130 +16343,93 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZWZdkrhEeSRw9blU02bnQ" name="Port1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZXAgErhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZXAgUrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZXAgErhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZXAgkrhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZXAg0rhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZXAhErhEeSRw9blU02bnQ" name="Port2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZXAhUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZXAhkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZXAhUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZXAh0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZXAiErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZXAiUrhEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZXnkErhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZXnkUrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZXnkErhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZXnkkrhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZXnk0rhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZXnlErhEeSRw9blU02bnQ" name="Port4" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZXnlUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZXnlkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZXnlUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZXnl0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZXnmErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZYOoErhEeSRw9blU02bnQ" name="Port5" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZYOoUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZYOokrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZYOoUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZYOo0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZYOpErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZYOpUrhEeSRw9blU02bnQ" name="Port6" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZYOpkrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZYOp0rhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZYOpkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZYOqErhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZYOqUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZY1sErhEeSRw9blU02bnQ" name="Port8" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZY1sUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZY1skrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZY1sUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZY1s0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZY1tErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZY1tUrhEeSRw9blU02bnQ" name="Port9" incomingEdges="_6Ze8UErhEeSRw9blU02bnQ" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZY1tkrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZY1t0rhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZY1tkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZY1uErhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZY1uUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZZcwErhEeSRw9blU02bnQ" name="collapsePort3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZZcwUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZZcwkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZZcwUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZZcw0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZZcxErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZZcxUrhEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZZcxkrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZZcx0rhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZZcxkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZZcyErhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZZcyUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZaD0ErhEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZaD0UrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZaD0krhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZaD0UrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZaD00rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZaD1ErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZWZcUrhEeSRw9blU02bnQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZWZckrhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZWZcUrhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZWZc0rhEeSRw9blU02bnQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZWZdErhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZWZdUrhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']"/>
         </ownedDiagramElements>
@@ -18599,12 +16437,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_6ZPry0rhEeSRw9blU02bnQ">
         <target xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZPrzErhEeSRw9blU02bnQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPrzUrhEeSRw9blU02bnQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6ZPrzErhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPrzkrhEeSRw9blU02bnQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPrz0rhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZPr0ErhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_6Zaq4ErhEeSRw9blU02bnQ">
@@ -18613,64 +16447,45 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6Zaq5krhEeSRw9blU02bnQ" name="Port1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZbR8ErhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZbR8UrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZbR8ErhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZbR8krhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZbR80rhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZbR9ErhEeSRw9blU02bnQ" name="Port2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZbR9UrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZbR9krhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZbR9UrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZbR90rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZbR-ErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6Zb5AErhEeSRw9blU02bnQ" name="Port3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6Zb5AUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6Zb5AkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6Zb5AUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6Zb5A0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6Zb5BErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6Zb5BUrhEeSRw9blU02bnQ" name="collapsePort1" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6Zb5BkrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6Zb5B0rhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6Zb5BkrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6Zb5CErhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6Zb5CUrhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_6ZcgEErhEeSRw9blU02bnQ" name="collapsePort2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZcgEUrhEeSRw9blU02bnQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZcgEkrhEeSRw9blU02bnQ"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_6ZcgEUrhEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZcgE0rhEeSRw9blU02bnQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_6ZcgFErhEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6Zaq4UrhEeSRw9blU02bnQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6Zaq4krhEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6Zaq4UrhEeSRw9blU02bnQ" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6Zaq40rhEeSRw9blU02bnQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6Zaq5ErhEeSRw9blU02bnQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6Zaq5UrhEeSRw9blU02bnQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']"/>
         </ownedDiagramElements>
@@ -18680,7 +16495,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M4v_4ErVEeSRw9blU02bnQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_6ZfjYErhEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZfjYUrhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -18689,7 +16503,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_BgK4kMT4EeCCRJc48YB8Ug"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_6ZfjY0rhEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZfjZErhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -18698,7 +16511,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_6ZgKcUrhEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZgKckrhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -18707,7 +16519,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_s84zwkpyEeSU7I_GWuX6JQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_6ZgxgErhEeSRw9blU02bnQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_6ZgxgUrhEeSRw9blU02bnQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -18722,6 +16533,9 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_K9PFonQgEeGzhLaBlPZdWw"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G0kNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G00NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <description xmi:type="description_1:DiagramDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']"/>
       <activatedFilters xmi:type="filter:CompositeFilterDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@filters[name='Collapse']"/>
       <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_K82EEXQgEeGzhLaBlPZdWw"/>
@@ -18789,58 +16603,46 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_Ro6TcnQgEeGzhLaBlPZdWw"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G1ENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G1UNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_U8C4IHQgEeGzhLaBlPZdWw" width="10" height="10" resizeKind="EAST_WEST" originalStyle="_U8C4IXQgEeGzhLaBlPZdWw">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_V-E84HQgEeGzhLaBlPZdWw" name="Port1" width="1" height="1" originalStyle="_V-E84XQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_V-E84XQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_V-E84nQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_V-E84XQgEeGzhLaBlPZdWw" showIcon="false" color="233,185,110">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.0/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_V-E843QgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_V-E85HQgEeGzhLaBlPZdWw" red="233" green="185" blue="110"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_V-GyEHQgEeGzhLaBlPZdWw" name="Port2" width="1" height="1" originalStyle="_V-GyEXQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_V-GyEXQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_V-GyEnQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_V-GyEXQgEeGzhLaBlPZdWw" showIcon="false" color="136,136,136">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.1/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_V-GyE3QgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_V-GyFHQgEeGzhLaBlPZdWw" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_V-InQHQgEeGzhLaBlPZdWw" name="Port3" width="1" height="1" originalStyle="_V-InQXQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_V-InQXQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_V-InQnQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_V-InQXQgEeGzhLaBlPZdWw" showIcon="false" color="138,226,52">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.2/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_V-InQ3QgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_V-InRHQgEeGzhLaBlPZdWw" red="138" green="226" blue="52"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_V-KccHQgEeGzhLaBlPZdWw" name="Port4" width="1" height="1" originalStyle="_V-KccXQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_V-KccXQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_V-LDgHQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_V-KccXQgEeGzhLaBlPZdWw" showIcon="false" color="252,175,62">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.3/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_V-LDgXQgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_V-LDgnQgEeGzhLaBlPZdWw" red="252" green="175" blue="62"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_U8C4IXQgEeGzhLaBlPZdWw" showIcon="false" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_U8C4InQgEeGzhLaBlPZdWw"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_U8C4I3QgEeGzhLaBlPZdWw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_U8C4JHQgEeGzhLaBlPZdWw" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']"/>
       </ownedDiagramElements>
@@ -18910,58 +16712,46 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_ubnCy3QgEeGzhLaBlPZdWw"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G1kNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G10NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_ubnCzHQgEeGzhLaBlPZdWw" width="10" height="10" resizeKind="EAST_WEST" originalStyle="_ubnC4XQgEeGzhLaBlPZdWw">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ubnCzXQgEeGzhLaBlPZdWw" name="Port1" width="1" height="1" originalStyle="_ubnCznQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ubnCznQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ubnCz3QgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ubnCznQgEeGzhLaBlPZdWw" showIcon="false" color="233,185,110">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.0/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ubnC0HQgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_ubnC0XQgEeGzhLaBlPZdWw" red="233" green="185" blue="110"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ubnC0nQgEeGzhLaBlPZdWw" name="Port2" width="1" height="1" originalStyle="_ubnC03QgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ubnC03QgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ubnC1HQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ubnC03QgEeGzhLaBlPZdWw" showIcon="false" color="136,136,136">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.1/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ubnC1XQgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_ubnC1nQgEeGzhLaBlPZdWw" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ubnC13QgEeGzhLaBlPZdWw" name="Port3" width="1" height="1" originalStyle="_ubnC2HQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ubnC2HQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ubnC2XQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ubnC2HQgEeGzhLaBlPZdWw" showIcon="false" color="138,226,52">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.2/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ubnC2nQgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_ubnC23QgEeGzhLaBlPZdWw" red="138" green="226" blue="52"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ubnC3HQgEeGzhLaBlPZdWw" name="Port4" width="1" height="1" originalStyle="_ubnC3XQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ubnC3XQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ubnC3nQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ubnC3XQgEeGzhLaBlPZdWw" showIcon="false" color="252,175,62">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.3/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ubnC33QgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_ubnC4HQgEeGzhLaBlPZdWw" red="252" green="175" blue="62"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_ubnC4XQgEeGzhLaBlPZdWw" showIcon="false" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ubnC4nQgEeGzhLaBlPZdWw"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ubnC43QgEeGzhLaBlPZdWw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_ubnC5HQgEeGzhLaBlPZdWw" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']"/>
       </ownedDiagramElements>
@@ -19075,102 +16865,78 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_wJHGdnQgEeGzhLaBlPZdWw"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G2ENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G2UNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_wJHGd3QgEeGzhLaBlPZdWw" width="10" height="10" resizeKind="EAST_WEST" originalStyle="_wJHtfHQgEeGzhLaBlPZdWw">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_wJHGeHQgEeGzhLaBlPZdWw" name="Port1" width="1" height="1" resizeKind="NSEW" originalStyle="_wJHGeXQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_wJHGeXQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_wJHGenQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_wJHGeXQgEeGzhLaBlPZdWw" showIcon="false" color="233,185,110">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.0/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_wJHGe3QgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_wJHGfHQgEeGzhLaBlPZdWw" red="233" green="185" blue="110"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_wJHGfXQgEeGzhLaBlPZdWw" name="Port2" width="1" height="1" resizeKind="NSEW" originalStyle="_wJHGfnQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_wJHGfnQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_wJHGf3QgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_wJHGfnQgEeGzhLaBlPZdWw" showIcon="false" color="136,136,136">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.1/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_wJHtcHQgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_wJHtcXQgEeGzhLaBlPZdWw" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_wJHtcnQgEeGzhLaBlPZdWw" name="Port3" width="1" height="1" originalStyle="_wJHtc3QgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_wJHtc3QgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_wJHtdHQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_wJHtc3QgEeGzhLaBlPZdWw" showIcon="false" color="138,226,52">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.2/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_wJHtdXQgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_wJHtdnQgEeGzhLaBlPZdWw" red="138" green="226" blue="52"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_wJHtd3QgEeGzhLaBlPZdWw" name="Port4" width="1" height="1" originalStyle="_wJHteHQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_wJHteHQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_wJHteXQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_wJHteHQgEeGzhLaBlPZdWw" showIcon="false" color="252,175,62">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.3/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_wJHtenQgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_wJHte3QgEeGzhLaBlPZdWw" red="252" green="175" blue="62"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_x9_kYHQgEeGzhLaBlPZdWw" name="Port5" width="1" height="1" originalStyle="_x9_kYXQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_x9_kYXQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_x9_kYnQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_x9_kYXQgEeGzhLaBlPZdWw" showIcon="false" color="173,127,168">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.4/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_x9_kY3QgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_x9_kZHQgEeGzhLaBlPZdWw" red="173" green="127" blue="168"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_x-BZkHQgEeGzhLaBlPZdWw" name="Port6" width="1" height="1" originalStyle="_x-BZkXQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_x-BZkXQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_x-BZknQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_x-BZkXQgEeGzhLaBlPZdWw" showIcon="false" color="239,41,41">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.5/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_x-BZk3QgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_x-BZlHQgEeGzhLaBlPZdWw" red="239" green="41" blue="41"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_x-D10HQgEeGzhLaBlPZdWw" name="Port7" width="1" height="1" originalStyle="_x-D10XQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_x-D10XQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_x-D10nQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_x-D10XQgEeGzhLaBlPZdWw" showIcon="false" color="252,233,79">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.6/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_x-D103QgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_x-D11HQgEeGzhLaBlPZdWw" red="252" green="233" blue="79"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_x-G5IHQgEeGzhLaBlPZdWw" name="Port8" width="1" height="1" originalStyle="_x-G5IXQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_x-G5IXQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_x-G5InQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_x-G5IXQgEeGzhLaBlPZdWw" showIcon="false" color="194,239,255">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.7/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_x-G5I3QgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_x-G5JHQgEeGzhLaBlPZdWw" red="194" green="239" blue="255"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_wJHtfHQgEeGzhLaBlPZdWw" showIcon="false" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_wJHtfXQgEeGzhLaBlPZdWw"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_wJHtfnQgEeGzhLaBlPZdWw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_wJHtf3QgEeGzhLaBlPZdWw" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']"/>
       </ownedDiagramElements>
@@ -19284,102 +17050,78 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_8mZtsnQgEeGzhLaBlPZdWw"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G2kNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G20NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_8mZts3QgEeGzhLaBlPZdWw" width="10" height="10" resizeKind="EAST_WEST" originalStyle="_8maUrXQgEeGzhLaBlPZdWw">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_8mZttHQgEeGzhLaBlPZdWw" name="Port1" width="1" height="1" originalStyle="_8mZttXQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8mZttXQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8mZttnQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8mZttXQgEeGzhLaBlPZdWw" showIcon="false" color="233,185,110">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.0/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_8mZtt3QgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_8mZtuHQgEeGzhLaBlPZdWw" red="233" green="185" blue="110"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_8mZtuXQgEeGzhLaBlPZdWw" name="Port2" width="1" height="1" originalStyle="_8mZtunQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8mZtunQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8mZtu3QgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8mZtunQgEeGzhLaBlPZdWw" showIcon="false" color="136,136,136">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.1/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_8mZtvHQgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_8mZtvXQgEeGzhLaBlPZdWw" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_8mZtvnQgEeGzhLaBlPZdWw" name="Port3" width="1" height="1" originalStyle="_8maUkHQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8maUkHQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUkXQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8maUkHQgEeGzhLaBlPZdWw" showIcon="false" color="138,226,52">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.2/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUknQgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_8maUk3QgEeGzhLaBlPZdWw" red="138" green="226" blue="52"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_8maUlHQgEeGzhLaBlPZdWw" name="Port4" width="1" height="1" originalStyle="_8maUlXQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8maUlXQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUlnQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8maUlXQgEeGzhLaBlPZdWw" showIcon="false" color="252,175,62">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.3/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUl3QgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_8maUmHQgEeGzhLaBlPZdWw" red="252" green="175" blue="62"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_8maUmXQgEeGzhLaBlPZdWw" name="Port5" width="1" height="1" originalStyle="_8maUmnQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8maUmnQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUm3QgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8maUmnQgEeGzhLaBlPZdWw" showIcon="false" color="173,127,168">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.4/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUnHQgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_8maUnXQgEeGzhLaBlPZdWw" red="173" green="127" blue="168"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_8maUnnQgEeGzhLaBlPZdWw" name="Port6" width="1" height="1" originalStyle="_8maUn3QgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8maUn3QgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUoHQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8maUn3QgEeGzhLaBlPZdWw" showIcon="false" color="239,41,41">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.5/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUoXQgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_8maUonQgEeGzhLaBlPZdWw" red="239" green="41" blue="41"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_8maUo3QgEeGzhLaBlPZdWw" name="Port7" width="1" height="1" originalStyle="_8maUpHQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8maUpHQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUpXQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8maUpHQgEeGzhLaBlPZdWw" showIcon="false" color="252,233,79">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.6/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUpnQgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_8maUp3QgEeGzhLaBlPZdWw" red="252" green="233" blue="79"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_8maUqHQgEeGzhLaBlPZdWw" name="Port8" width="1" height="1" originalStyle="_8maUqXQgEeGzhLaBlPZdWw">
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8maUqXQgEeGzhLaBlPZdWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUqnQgEeGzhLaBlPZdWw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8maUqXQgEeGzhLaBlPZdWw" showIcon="false" color="194,239,255">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.7/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUq3QgEeGzhLaBlPZdWw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_8maUrHQgEeGzhLaBlPZdWw" red="194" green="239" blue="255"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_8maUrXQgEeGzhLaBlPZdWw" showIcon="false" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUrnQgEeGzhLaBlPZdWw"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_8maUr3QgEeGzhLaBlPZdWw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_8maUsHQgEeGzhLaBlPZdWw" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']"/>
       </ownedDiagramElements>
@@ -19638,15 +17380,14 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_r0g18p2nEeGuBfXy2egLgQ"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G3ENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G3UNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_rynYgZ2nEeGuBfXy2egLgQ" name="ParentComponent">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYgp2nEeGuBfXy2egLgQ" labelSize="10" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYg52nEeGuBfXy2egLgQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYgp2nEeGuBfXy2egLgQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYhJ2nEeGuBfXy2egLgQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYhZ2nEeGuBfXy2egLgQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYhp2nEeGuBfXy2egLgQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_rynYh52nEeGuBfXy2egLgQ" name="InnerComponent">
@@ -19656,19 +17397,12 @@
             <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_rynYiZ2nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYip2nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYi52nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_rynYjJ2nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYjZ2nEeGuBfXy2egLgQ" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYjp2nEeGuBfXy2egLgQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYjZ2nEeGuBfXy2egLgQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYj52nEeGuBfXy2egLgQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYkJ2nEeGuBfXy2egLgQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYkZ2nEeGuBfXy2egLgQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         </ownedDiagramElements>
@@ -19676,12 +17410,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_rynYkp2nEeGuBfXy2egLgQ" name="ComponentToTestDnDWithHidingEdge">
         <target xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_0tyyQMT3EeCCRJc48YB8Ug"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYk52nEeGuBfXy2egLgQ" labelSize="10" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYlJ2nEeGuBfXy2egLgQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYk52nEeGuBfXy2egLgQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYlZ2nEeGuBfXy2egLgQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYlp2nEeGuBfXy2egLgQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYl52nEeGuBfXy2egLgQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_rynYmJ2nEeGuBfXy2egLgQ" name="InnerComponent1">
@@ -19691,19 +17421,12 @@
             <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_rynYmp2nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYm52nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYnJ2nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_rynYnZ2nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYnp2nEeGuBfXy2egLgQ" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYn52nEeGuBfXy2egLgQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYnp2nEeGuBfXy2egLgQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYoJ2nEeGuBfXy2egLgQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYoZ2nEeGuBfXy2egLgQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYop2nEeGuBfXy2egLgQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         </ownedDiagramElements>
@@ -19714,31 +17437,20 @@
             <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_rynYpZ2nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYpp2nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYp52nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_rynYqJ2nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYqZ2nEeGuBfXy2egLgQ" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYqp2nEeGuBfXy2egLgQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYqZ2nEeGuBfXy2egLgQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYq52nEeGuBfXy2egLgQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYrJ2nEeGuBfXy2egLgQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYrZ2nEeGuBfXy2egLgQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         </ownedDiagramElements>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_rynYrp2nEeGuBfXy2egLgQ" name="InnerComponent3">
           <target xmi:type="uml:Component" href="uml2.uml#_0tyyQcT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Component" href="uml2.uml#_0tyyQcT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYr52nEeGuBfXy2egLgQ" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYsJ2nEeGuBfXy2egLgQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYr52nEeGuBfXy2egLgQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYsZ2nEeGuBfXy2egLgQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYsp2nEeGuBfXy2egLgQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYs52nEeGuBfXy2egLgQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         </ownedDiagramElements>
@@ -19746,12 +17458,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_rynYtJ2nEeGuBfXy2egLgQ" name="AnotherParentComponent">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUHGoEeG8G_zeQrcp1A"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYtZ2nEeGuBfXy2egLgQ" labelSize="10" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYtp2nEeGuBfXy2egLgQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rynYtZ2nEeGuBfXy2egLgQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYt52nEeGuBfXy2egLgQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYuJ2nEeGuBfXy2egLgQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYuZ2nEeGuBfXy2egLgQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_rynYup2nEeGuBfXy2egLgQ" name="ComponentWithnPorts">
@@ -19761,10 +17469,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_rynYvJ2nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYvZ2nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rynYvp2nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_rynYv52nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -19772,10 +17477,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ryn_kJ2nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_kZ2nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_kp2nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ryn_k52nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -19783,10 +17485,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ryn_lZ2nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_lp2nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_l52nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ryn_mJ2nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -19794,10 +17493,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ryn_mp2nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_m52nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_nJ2nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ryn_nZ2nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -19805,10 +17501,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ryn_n52nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_oJ2nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_oZ2nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ryn_op2nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -19816,10 +17509,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ryn_pJ2nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_pZ2nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_pp2nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ryn_p52nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -19827,10 +17517,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ryn_qZ2nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_qp2nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_q52nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ryn_rJ2nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -19838,19 +17525,12 @@
             <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ryn_rp2nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_r52nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_sJ2nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ryn_sZ2nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ryn_sp2nEeGuBfXy2egLgQ" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_s52nEeGuBfXy2egLgQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ryn_sp2nEeGuBfXy2egLgQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_tJ2nEeGuBfXy2egLgQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_tZ2nEeGuBfXy2egLgQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_tp2nEeGuBfXy2egLgQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         </ownedDiagramElements>
@@ -19858,12 +17538,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_ryn_t52nEeGuBfXy2egLgQ" name="AnotherParentComponent2">
         <target xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_6YL-8HQfEeGzhLaBlPZdWw"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ryn_uJ2nEeGuBfXy2egLgQ" labelSize="10" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_uZ2nEeGuBfXy2egLgQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ryn_uJ2nEeGuBfXy2egLgQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_up2nEeGuBfXy2egLgQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_u52nEeGuBfXy2egLgQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_vJ2nEeGuBfXy2egLgQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_ryn_vZ2nEeGuBfXy2egLgQ" name="ComponentWith3Ports">
@@ -19873,10 +17549,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ryn_v52nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_wJ2nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_wZ2nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ryn_wp2nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -19884,10 +17557,7 @@
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ryn_xJ2nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_xZ2nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_xp2nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ryn_x52nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
@@ -19895,19 +17565,12 @@
             <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
             <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ryn_yZ2nEeGuBfXy2egLgQ" showIcon="false">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_yp2nEeGuBfXy2egLgQ"/>
               <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_y52nEeGuBfXy2egLgQ"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ryn_zJ2nEeGuBfXy2egLgQ"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ryn_zZ2nEeGuBfXy2egLgQ" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_zp2nEeGuBfXy2egLgQ"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ryn_zZ2nEeGuBfXy2egLgQ" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_z52nEeGuBfXy2egLgQ"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_0J2nEeGuBfXy2egLgQ" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ryn_0Z2nEeGuBfXy2egLgQ" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"/>
         </ownedDiagramElements>
@@ -20010,50 +17673,41 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_GlHM0rE_EeGHZsUW4sx9qg"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G3kNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G30NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_JtJ70LE_EeGHZsUW4sx9qg" width="10" height="10" resizeKind="NSEW">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_JtJ70bE_EeGHZsUW4sx9qg" name="Port1" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_JtJ70rE_EeGHZsUW4sx9qg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JtJ707E_EeGHZsUW4sx9qg"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_JtJ70rE_EeGHZsUW4sx9qg" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_JtJ71LE_EeGHZsUW4sx9qg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_JtJ71bE_EeGHZsUW4sx9qg" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_JtJ71rE_EeGHZsUW4sx9qg" name="Port2" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_JtJ717E_EeGHZsUW4sx9qg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JtJ72LE_EeGHZsUW4sx9qg"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_JtJ717E_EeGHZsUW4sx9qg" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_JtJ72bE_EeGHZsUW4sx9qg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_JtJ72rE_EeGHZsUW4sx9qg" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_JtJ727E_EeGHZsUW4sx9qg" name="Port3" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_JtJ73LE_EeGHZsUW4sx9qg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JtJ73bE_EeGHZsUW4sx9qg"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_JtJ73LE_EeGHZsUW4sx9qg" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_JtJ73rE_EeGHZsUW4sx9qg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_JtJ737E_EeGHZsUW4sx9qg" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_JtJ74LE_EeGHZsUW4sx9qg" name="Port4" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_JtJ74bE_EeGHZsUW4sx9qg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JtJ74rE_EeGHZsUW4sx9qg"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_JtJ74bE_EeGHZsUW4sx9qg" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_JtJ747E_EeGHZsUW4sx9qg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_JtJ75LE_EeGHZsUW4sx9qg" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
@@ -20061,11 +17715,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
           <graphicalFilters xmi:type="diagram:CollapseFilter" xmi:id="_aB4kIGuzEeKKE-qMx3PRKQ" width="10" height="10"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="__sioEWuyEeKKE-qMx3PRKQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="__sioEmuyEeKKE-qMx3PRKQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="__sioEWuyEeKKE-qMx3PRKQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="__sjPIGuyEeKKE-qMx3PRKQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="__sjPIWuyEeKKE-qMx3PRKQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
@@ -20073,11 +17724,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
           <graphicalFilters xmi:type="diagram:CollapseFilter" xmi:id="_aB5LMWuzEeKKE-qMx3PRKQ" width="10" height="10"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="__sj2MGuyEeKKE-qMx3PRKQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="__sj2MWuyEeKKE-qMx3PRKQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="__sj2MGuyEeKKE-qMx3PRKQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="__sj2MmuyEeKKE-qMx3PRKQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="__sj2M2uyEeKKE-qMx3PRKQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
@@ -20085,19 +17733,13 @@
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
           <graphicalFilters xmi:type="diagram:CollapseFilter" xmi:id="_aB5yQGuzEeKKE-qMx3PRKQ" width="10" height="10"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="__skdQGuyEeKKE-qMx3PRKQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="__skdQWuyEeKKE-qMx3PRKQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="__skdQGuyEeKKE-qMx3PRKQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="__skdQmuyEeKKE-qMx3PRKQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="__skdQ2uyEeKKE-qMx3PRKQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_JtJ7-bE_EeGHZsUW4sx9qg" showIcon="false" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JtJ7-rE_EeGHZsUW4sx9qg"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_JtJ7-7E_EeGHZsUW4sx9qg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_JtJ7_LE_EeGHZsUW4sx9qg" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']"/>
       </ownedDiagramElements>
@@ -20304,17 +17946,17 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G4ENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G4UNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_sOsWAWu3EeKKE-qMx3PRKQ" name="InnerComponent1" width="10" height="10" resizeKind="EAST_WEST">
         <target xmi:type="uml:Component" href="uml2.uml#_4W7cIMT3EeCCRJc48YB8Ug"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_4W7cIMT3EeCCRJc48YB8Ug"/>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_sOsWAmu3EeKKE-qMx3PRKQ" name="Port1" outgoingEdges="_SK8CwEpHEeSo2unxERPWgg" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_4W7cIcT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_sOsWA2u3EeKKE-qMx3PRKQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sOsWBGu3EeKKE-qMx3PRKQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_sOsWA2u3EeKKE-qMx3PRKQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sOsWBWu3EeKKE-qMx3PRKQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_sOsWBmu3EeKKE-qMx3PRKQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
@@ -20324,30 +17966,21 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_deVocEotEeSUzKpYpQxHZQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_deVocUotEeSUzKpYpQxHZQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_deVocEotEeSUzKpYpQxHZQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_deVockotEeSUzKpYpQxHZQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_deVoc0otEeSUzKpYpQxHZQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_s88eIEpyEeSU7I_GWuX6JQ" name="Port7" outgoingEdges="_s9Dy4kpyEeSU7I_GWuX6JQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_s84zwEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_s89FMEpyEeSU7I_GWuX6JQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_s89FMUpyEeSU7I_GWuX6JQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_s89FMEpyEeSU7I_GWuX6JQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_s89FMkpyEeSU7I_GWuX6JQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_s89FM0pyEeSU7I_GWuX6JQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_sOsWB2u3EeKKE-qMx3PRKQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sOsWCGu3EeKKE-qMx3PRKQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sOsWCWu3EeKKE-qMx3PRKQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_sOsWCmu3EeKKE-qMx3PRKQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']"/>
       </ownedDiagramElements>
@@ -20357,11 +17990,8 @@
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_sOsWDGu3EeKKE-qMx3PRKQ" name="Port2" incomingEdges="_SK8CwEpHEeSo2unxERPWgg" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_5wkvocT3EeCCRJc48YB8Ug"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_sOsWDWu3EeKKE-qMx3PRKQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sOsWDmu3EeKKE-qMx3PRKQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_sOsWDWu3EeKKE-qMx3PRKQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sOsWD2u3EeKKE-qMx3PRKQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_sOsWEGu3EeKKE-qMx3PRKQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
@@ -20369,11 +17999,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_tvS-YGu9EeKKE-qMx3PRKQ"/>
           <graphicalFilters xmi:type="diagram:CollapseFilter" xmi:id="_sjBmQGvCEeKKE-qMx3PRKQ" width="10" height="10"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_zHRvsGu9EeKKE-qMx3PRKQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_zHRvsWu9EeKKE-qMx3PRKQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_zHRvsGu9EeKKE-qMx3PRKQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_zHRvsmu9EeKKE-qMx3PRKQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_zHRvs2u9EeKKE-qMx3PRKQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
@@ -20381,30 +18008,21 @@
           <target xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_oIZ1EGvCEeKKE-qMx3PRKQ"/>
           <graphicalFilters xmi:type="diagram:CollapseFilter" xmi:id="_sjCNUWvCEeKKE-qMx3PRKQ" width="10" height="10"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_qf0YYGvCEeKKE-qMx3PRKQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_qf0YYWvCEeKKE-qMx3PRKQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_qf0YYGvCEeKKE-qMx3PRKQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_qf0YYmvCEeKKE-qMx3PRKQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_qf0YY2vCEeKKE-qMx3PRKQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_kLYm0Gx7EeKmNesCCiZqKw" name="Port3" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_fZdv8Gx7EeKmNesCCiZqKw"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_kLf7kGx7EeKmNesCCiZqKw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_kLgioGx7EeKmNesCCiZqKw"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_kLf7kGx7EeKmNesCCiZqKw" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_kLgioWx7EeKmNesCCiZqKw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_kLgiomx7EeKmNesCCiZqKw" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_sOsWEWu3EeKKE-qMx3PRKQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sOsWEmu3EeKKE-qMx3PRKQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sOsWE2u3EeKKE-qMx3PRKQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_sOsWFGu3EeKKE-qMx3PRKQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']"/>
       </ownedDiagramElements>
@@ -20415,11 +18033,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_w-T4EGu9EeKKE-qMx3PRKQ"/>
           <graphicalFilters xmi:type="diagram:CollapseFilter" xmi:id="_sjC0YGvCEeKKE-qMx3PRKQ" width="10" height="10"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_zHS90Gu9EeKKE-qMx3PRKQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_zHS90Wu9EeKKE-qMx3PRKQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_zHS90Gu9EeKKE-qMx3PRKQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_zHS90mu9EeKKE-qMx3PRKQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_zHS902u9EeKKE-qMx3PRKQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
@@ -20429,30 +18044,21 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ioiRoUrLEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ioiRokrLEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ioiRoUrLEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ioiRo0rLEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_ioiRpErLEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ioiRpUrLEeSRw9blU02bnQ" name="Port6" incomingEdges="_s9Dy4kpyEeSU7I_GWuX6JQ" width="1" height="1">
           <target xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_E4BzsEpyEeSU7I_GWuX6JQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ioiRpkrLEeSRw9blU02bnQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ioiRp0rLEeSRw9blU02bnQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ioiRpkrLEeSRw9blU02bnQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ioiRqErLEeSRw9blU02bnQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_ioiRqUrLEeSRw9blU02bnQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_sOsWFmu3EeKKE-qMx3PRKQ" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sOsWF2u3EeKKE-qMx3PRKQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sOsWGGu3EeKKE-qMx3PRKQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_sOsWGWu3EeKKE-qMx3PRKQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']"/>
       </ownedDiagramElements>
@@ -20462,7 +18068,6 @@
         <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_yfb9gEpKEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_SK8CwUpHEeSo2unxERPWgg" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_SK8CwkpHEeSo2unxERPWgg" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -20471,7 +18076,6 @@
         <semanticElements xmi:type="uml:Deployment" href="uml2.uml#_M_bVQUpJEeSo2unxERPWgg"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_uRSiEUpKEeSo2unxERPWgg" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_uRSiEkpKEeSo2unxERPWgg" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -20481,7 +18085,6 @@
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_s9EZ8EpyEeSU7I_GWuX6JQ" size="2" routingStyle="manhattan">
           <customFeatures>routingStyle</customFeatures>
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_s9EZ8UpyEeSU7I_GWuX6JQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -20519,25 +18122,22 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_TpXo0m6mEeKaRcjh1c1xpQ"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G4kNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G40NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_Vs7cAG6mEeKaRcjh1c1xpQ" width="10" height="10" resizeKind="EAST_WEST">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Wcl-YG6mEeKaRcjh1c1xpQ" name="Port1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_WcmlcG6mEeKaRcjh1c1xpQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_WcmlcW6mEeKaRcjh1c1xpQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_WcmlcG6mEeKaRcjh1c1xpQ" showIcon="false" color="233,185,110">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.0/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Wcmlcm6mEeKaRcjh1c1xpQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Wcmlc26mEeKaRcjh1c1xpQ" red="233" green="185" blue="110"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_Vs7cAW6mEeKaRcjh1c1xpQ" showIcon="false" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Vs7cAm6mEeKaRcjh1c1xpQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Vs7cA26mEeKaRcjh1c1xpQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_Vs7cBG6mEeKaRcjh1c1xpQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']"/>
       </ownedDiagramElements>
@@ -20585,17 +18185,17 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_vr0m-m6mEeKaRcjh1c1xpQ"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G5ENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G5UNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_vr0m-26mEeKaRcjh1c1xpQ" width="10" height="10" resizeKind="EAST_WEST">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_vr0m_G6mEeKaRcjh1c1xpQ" name="Port1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_vr0m_W6mEeKaRcjh1c1xpQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_vr0m_m6mEeKaRcjh1c1xpQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_vr0m_W6mEeKaRcjh1c1xpQ" showIcon="false" color="233,185,110">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.0/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_vr0m_26mEeKaRcjh1c1xpQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_vr0nAG6mEeKaRcjh1c1xpQ" red="233" green="185" blue="110"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
@@ -20603,19 +18203,13 @@
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <graphicalFilters xmi:type="diagram:CollapseFilter" xmi:id="_4n80cG6mEeKaRcjh1c1xpQ" width="10" height="10"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_vr0nAm6mEeKaRcjh1c1xpQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_vr0nA26mEeKaRcjh1c1xpQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_vr0nAm6mEeKaRcjh1c1xpQ" showIcon="false" color="136,136,136">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.1/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_vr0nBG6mEeKaRcjh1c1xpQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_vr0nBW6mEeKaRcjh1c1xpQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_vr0nBm6mEeKaRcjh1c1xpQ" showIcon="false" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_vr0nB26mEeKaRcjh1c1xpQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_vr0nCG6mEeKaRcjh1c1xpQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_vr0nCW6mEeKaRcjh1c1xpQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']"/>
       </ownedDiagramElements>
@@ -20653,6 +18247,9 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_8NS4o26oEeKaRcjh1c1xpQ"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G5kNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G50NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_8NS4pG6oEeKaRcjh1c1xpQ" width="10" height="10" resizeKind="EAST_WEST">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
@@ -20660,19 +18257,13 @@
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <graphicalFilters xmi:type="diagram:CollapseFilter" xmi:id="_U6nG4G6pEeKaRcjh1c1xpQ" width="10" height="10"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_NiuTUW6pEeKaRcjh1c1xpQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_NiuTUm6pEeKaRcjh1c1xpQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_NiuTUW6pEeKaRcjh1c1xpQ" showIcon="false" color="136,136,136">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.1/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_NiuTU26pEeKaRcjh1c1xpQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_NiuTVG6pEeKaRcjh1c1xpQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_8NS4qm6oEeKaRcjh1c1xpQ" showIcon="false" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8NS4q26oEeKaRcjh1c1xpQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_8NS4rG6oEeKaRcjh1c1xpQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_8NS4rW6oEeKaRcjh1c1xpQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']"/>
       </ownedDiagramElements>
@@ -20721,17 +18312,17 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_-29Ci26oEeKaRcjh1c1xpQ"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G6ENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G6UNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_-29CjG6oEeKaRcjh1c1xpQ" width="10" height="10" resizeKind="EAST_WEST">
         <target xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_soduUXGoEeG8G_zeQrcp1A"/>
         <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-29CjW6oEeKaRcjh1c1xpQ" name="Port1" width="1" height="1" resizeKind="NSEW">
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_-29Cjm6oEeKaRcjh1c1xpQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_-29Cj26oEeKaRcjh1c1xpQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_-29Cjm6oEeKaRcjh1c1xpQ" showIcon="false" color="233,185,110">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.0/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_-29CkG6oEeKaRcjh1c1xpQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_-29CkW6oEeKaRcjh1c1xpQ" red="233" green="185" blue="110"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
@@ -20739,19 +18330,13 @@
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <graphicalFilters xmi:type="diagram:CollapseFilter" xmi:id="_5mB0AG6rEeKaRcjh1c1xpQ" width="10" height="10"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_-29ClG6oEeKaRcjh1c1xpQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_-29ClW6oEeKaRcjh1c1xpQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_-29ClG6oEeKaRcjh1c1xpQ" showIcon="false" color="136,136,136">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']/@conditionnalStyles.1/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_-29Clm6oEeKaRcjh1c1xpQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_-29Cl26oEeKaRcjh1c1xpQ" red="136" green="136" blue="136"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']"/>
         </ownedBorderedNodes>
         <ownedStyle xmi:type="diagram:Square" xmi:id="_-29CmG6oEeKaRcjh1c1xpQ" showIcon="false" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_-29CmW6oEeKaRcjh1c1xpQ"/>
           <description xmi:type="style:SquareDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_-29Cmm6oEeKaRcjh1c1xpQ"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_-29Cm26oEeKaRcjh1c1xpQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']"/>
       </ownedDiagramElements>
@@ -20821,18 +18406,17 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_NufOh1BOEeSC7-UZ3cx31A"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G6kNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G60NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_NuWEgVBOEeSC7-UZ3cx31A" name="RootPackage1">
         <target xmi:type="uml:Package" href="uml2.uml#_05Rt4MlFEd6R3_bpV99jfA"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_05Rt4MlFEd6R3_bpV99jfA"/>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NuWEglBOEeSC7-UZ3cx31A" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_NuWEg1BOEeSC7-UZ3cx31A"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NuWEglBOEeSC7-UZ3cx31A" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_NuWEhFBOEeSC7-UZ3cx31A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_NuWEhVBOEeSC7-UZ3cx31A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_NuWEhlBOEeSC7-UZ3cx31A" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_NuWEh1BOEeSC7-UZ3cx31A" name="ContainerPackageToDrop">
@@ -20841,12 +18425,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NuWEiFBOEeSC7-UZ3cx31A" labelSize="10">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_NuWEiVBOEeSC7-UZ3cx31A"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NuWEiFBOEeSC7-UZ3cx31A" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_NuWEilBOEeSC7-UZ3cx31A"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_NuWEi1BOEeSC7-UZ3cx31A" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_NuWEjFBOEeSC7-UZ3cx31A" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
         </ownedDiagramElements>
@@ -20857,12 +18437,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NuWEjlBOEeSC7-UZ3cx31A" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_NuWEj1BOEeSC7-UZ3cx31A"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NuWEjlBOEeSC7-UZ3cx31A" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_NuWEkFBOEeSC7-UZ3cx31A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOcFBOEeSC7-UZ3cx31A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOcVBOEeSC7-UZ3cx31A" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
@@ -20872,12 +18448,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NufOc1BOEeSC7-UZ3cx31A" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOdFBOEeSC7-UZ3cx31A"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NufOc1BOEeSC7-UZ3cx31A" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOdVBOEeSC7-UZ3cx31A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOdlBOEeSC7-UZ3cx31A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOd1BOEeSC7-UZ3cx31A" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
@@ -20887,12 +18459,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NufOeVBOEeSC7-UZ3cx31A" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOelBOEeSC7-UZ3cx31A"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NufOeVBOEeSC7-UZ3cx31A" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOe1BOEeSC7-UZ3cx31A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOfFBOEeSC7-UZ3cx31A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOfVBOEeSC7-UZ3cx31A" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
@@ -20902,12 +18470,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NufOf1BOEeSC7-UZ3cx31A" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOgFBOEeSC7-UZ3cx31A"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NufOf1BOEeSC7-UZ3cx31A" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOgVBOEeSC7-UZ3cx31A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOglBOEeSC7-UZ3cx31A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_NufOg1BOEeSC7-UZ3cx31A" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
@@ -20975,26 +18539,21 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_OJQ2MlBfEeSffY-bE6LX7Q"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G7ENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G7UNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_OJHFMVBfEeSffY-bE6LX7Q" name="RootPackage1">
         <target xmi:type="uml:Package" href="uml2.uml#_05Rt4MlFEd6R3_bpV99jfA"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_05Rt4MlFEd6R3_bpV99jfA"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OJHFMlBfEeSffY-bE6LX7Q" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFM1BfEeSffY-bE6LX7Q"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OJHFMlBfEeSffY-bE6LX7Q" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFNFBfEeSffY-bE6LX7Q"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFNVBfEeSffY-bE6LX7Q" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFNlBfEeSffY-bE6LX7Q" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_OJHFN1BfEeSffY-bE6LX7Q" name="ContainerPackageToDrop">
           <target xmi:type="uml:Package" href="uml2.uml#_0KL4oMlYEd6fBP-DQJTG8g"/>
           <semanticElements xmi:type="uml:Package" href="uml2.uml#_0KL4oMlYEd6fBP-DQJTG8g"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OJHFOFBfEeSffY-bE6LX7Q" labelSize="10">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFOVBfEeSffY-bE6LX7Q"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OJHFOFBfEeSffY-bE6LX7Q" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFOlBfEeSffY-bE6LX7Q"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFO1BfEeSffY-bE6LX7Q" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFPFBfEeSffY-bE6LX7Q" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
         </ownedDiagramElements>
@@ -21002,48 +18561,32 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_OJHFPVBfEeSffY-bE6LX7Q" name="blabla">
         <target xmi:type="uml:Package" href="uml2.uml#_xEONQMlYEd6fBP-DQJTG8g"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_xEONQMlYEd6fBP-DQJTG8g"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OJHFPlBfEeSffY-bE6LX7Q" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFP1BfEeSffY-bE6LX7Q"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OJHFPlBfEeSffY-bE6LX7Q" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFQFBfEeSffY-bE6LX7Q"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFQVBfEeSffY-bE6LX7Q" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFQlBfEeSffY-bE6LX7Q" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_OJHFQ1BfEeSffY-bE6LX7Q" name="CanvasPackageToDrop1">
         <target xmi:type="uml:Package" href="uml2.uml#_5WHK8MlYEd6fBP-DQJTG8g"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_5WHK8MlYEd6fBP-DQJTG8g"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OJHFRFBfEeSffY-bE6LX7Q" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFRVBfEeSffY-bE6LX7Q"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OJHFRFBfEeSffY-bE6LX7Q" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFRlBfEeSffY-bE6LX7Q"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFR1BfEeSffY-bE6LX7Q" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFSFBfEeSffY-bE6LX7Q" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_OJHFSVBfEeSffY-bE6LX7Q" name="CanvasPackageToDrop2">
         <target xmi:type="uml:Package" href="uml2.uml#_smH00MlZEd6fBP-DQJTG8g"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_smH00MlZEd6fBP-DQJTG8g"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OJHFSlBfEeSffY-bE6LX7Q" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFS1BfEeSffY-bE6LX7Q"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OJHFSlBfEeSffY-bE6LX7Q" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFTFBfEeSffY-bE6LX7Q"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFTVBfEeSffY-bE6LX7Q" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFTlBfEeSffY-bE6LX7Q" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_OJHFT1BfEeSffY-bE6LX7Q" name="AAPackage">
         <target xmi:type="uml:Package" href="uml2.uml#_Oc8wYKdTEeKPKojEdycshQ"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_Oc8wYKdTEeKPKojEdycshQ"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OJHFUFBfEeSffY-bE6LX7Q" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFUVBfEeSffY-bE6LX7Q"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OJHFUFBfEeSffY-bE6LX7Q" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFUlBfEeSffY-bE6LX7Q"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFU1BfEeSffY-bE6LX7Q" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OJHFVFBfEeSffY-bE6LX7Q" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
@@ -21111,26 +18654,21 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_iN2BKFLfEeSv1LsiD8_U5w"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G7kNXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G70NXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_iN2BAVLfEeSv1LsiD8_U5w" name="RootPackage1">
         <target xmi:type="uml:Package" href="uml2.uml#_05Rt4MlFEd6R3_bpV99jfA"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_05Rt4MlFEd6R3_bpV99jfA"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iN2BAlLfEeSv1LsiD8_U5w" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BA1LfEeSv1LsiD8_U5w"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iN2BAlLfEeSv1LsiD8_U5w" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BBFLfEeSv1LsiD8_U5w"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BBVLfEeSv1LsiD8_U5w" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BBlLfEeSv1LsiD8_U5w" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_iN2BB1LfEeSv1LsiD8_U5w" name="ContainerPackageToDrop">
           <target xmi:type="uml:Package" href="uml2.uml#_0KL4oMlYEd6fBP-DQJTG8g"/>
           <semanticElements xmi:type="uml:Package" href="uml2.uml#_0KL4oMlYEd6fBP-DQJTG8g"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iN2BCFLfEeSv1LsiD8_U5w" labelSize="10">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BCVLfEeSv1LsiD8_U5w"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iN2BCFLfEeSv1LsiD8_U5w" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
             <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BClLfEeSv1LsiD8_U5w"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BC1LfEeSv1LsiD8_U5w" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BDFLfEeSv1LsiD8_U5w" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
         </ownedDiagramElements>
@@ -21138,12 +18676,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_iN2BDVLfEeSv1LsiD8_U5w" name="RootPackage2">
         <target xmi:type="uml:Package" href="uml2.uml#_xEONQMlYEd6fBP-DQJTG8g"/>
         <semanticElements xmi:type="uml:Package" href="uml2.uml#_xEONQMlYEd6fBP-DQJTG8g"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iN2BDlLfEeSv1LsiD8_U5w" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BD1LfEeSv1LsiD8_U5w"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iN2BDlLfEeSv1LsiD8_U5w" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BEFLfEeSv1LsiD8_U5w"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BEVLfEeSv1LsiD8_U5w" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BElLfEeSv1LsiD8_U5w" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
@@ -21153,12 +18687,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iN2BFFLfEeSv1LsiD8_U5w" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BFVLfEeSv1LsiD8_U5w"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iN2BFFLfEeSv1LsiD8_U5w" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BFlLfEeSv1LsiD8_U5w"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BF1LfEeSv1LsiD8_U5w" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BGFLfEeSv1LsiD8_U5w" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
@@ -21168,12 +18698,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iN2BGlLfEeSv1LsiD8_U5w" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BG1LfEeSv1LsiD8_U5w"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iN2BGlLfEeSv1LsiD8_U5w" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BHFLfEeSv1LsiD8_U5w"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BHVLfEeSv1LsiD8_U5w" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BHlLfEeSv1LsiD8_U5w" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
@@ -21183,12 +18709,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iN2BIFLfEeSv1LsiD8_U5w" labelSize="10">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BIVLfEeSv1LsiD8_U5w"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_iN2BIFLfEeSv1LsiD8_U5w" labelSize="10" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BIlLfEeSv1LsiD8_U5w"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BI1LfEeSv1LsiD8_U5w" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_iN2BJFLfEeSv1LsiD8_U5w" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"/>
       </ownedDiagramElements>
@@ -21599,6 +19121,9 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_8S4G8ENXEea_NvY-zhbnXg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_8S4G8UNXEea_NvY-zhbnXg"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7Bv6UVLxEeSXs5uRvkBeEQ" visible="false">
         <target xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
         <semanticElements xmi:type="uml:Component" href="uml2.uml#_WohEkNKaEd6qFrkOl_onzg"/>
@@ -21607,23 +19132,16 @@
           <target xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_ZzKboNKaEd6qFrkOl_onzg"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnaVLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6U1LxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6VFLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6U1LxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6VVLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6VlLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Bv6V1LxEeSXs5uRvkBeEQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6WFLxEeSXs5uRvkBeEQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Bv6V1LxEeSXs5uRvkBeEQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6WVLxEeSXs5uRvkBeEQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6WlLxEeSXs5uRvkBeEQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6W1LxEeSXs5uRvkBeEQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']"/>
       </ownedDiagramElements>
@@ -21636,11 +19154,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6XlLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6X1LxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6XlLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6YFLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6YVLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21650,11 +19165,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6Y1LxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6ZFLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6Y1LxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6ZVLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6ZlLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21664,11 +19176,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6aFLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6aVLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6aFLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6alLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6a1LxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21678,11 +19187,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6bVLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6blLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6bVLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6b1LxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6cFLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21692,11 +19198,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6clLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6c1LxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6clLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6dFLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6dVLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21707,11 +19210,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6d1LxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6eFLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6d1LxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6eVLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6elLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21722,11 +19222,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6fFLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6fVLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6fFLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6flLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6f1LxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21737,11 +19234,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6gVLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6glLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6gVLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6g1LxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6hFLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21752,11 +19246,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6hlLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6h1LxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6hlLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6iFLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6iVLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21767,23 +19258,16 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6i1LxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6jFLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6i1LxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6jVLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6jlLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Bv6j1LxEeSXs5uRvkBeEQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6kFLxEeSXs5uRvkBeEQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Bv6j1LxEeSXs5uRvkBeEQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6kVLxEeSXs5uRvkBeEQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6klLxEeSXs5uRvkBeEQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6k1LxEeSXs5uRvkBeEQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']"/>
       </ownedDiagramElements>
@@ -21795,11 +19279,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduUnGoEeG8G_zeQrcp1A"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnbFLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6llLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6l1LxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6llLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6mFLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6mVLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21807,11 +19288,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduU3GoEeG8G_zeQrcp1A"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnclLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6m1LxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6nFLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6m1LxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6nVLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6nlLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21819,11 +19297,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_soduVHGoEeG8G_zeQrcp1A"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnaFLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6oFLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6oVLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6oFLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6olLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6o1LxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21831,11 +19306,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GO5kHQfEeGzhLaBlPZdWw"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnYFLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6pVLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6plLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6pVLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6p1LxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6qFLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21843,11 +19315,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoHQfEeGzhLaBlPZdWw"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUncFLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6qlLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6q1LxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6qlLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6rFLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6rVLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21855,11 +19324,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9GPgoXQfEeGzhLaBlPZdWw"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnblLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6r1LxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6sFLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6r1LxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6sVLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6slLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21867,11 +19333,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MHQfEeGzhLaBlPZdWw"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnY1LyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6tFLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6tVLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6tFLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6tlLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6t1LxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21879,11 +19342,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_9xW6MXQfEeGzhLaBlPZdWw"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnYVLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6uVLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6ulLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6uVLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6u1LxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6vFLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21891,11 +19351,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_2RMvAGuyEeKKE-qMx3PRKQ"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnYlLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6vlLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6v1LxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6vlLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6wFLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6wVLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21903,11 +19360,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAWuyEeKKE-qMx3PRKQ"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnZlLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6w1LxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6xFLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6w1LxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6xVLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6xlLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21915,23 +19369,16 @@
           <target xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_QxwSAmuyEeKKE-qMx3PRKQ"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnc1LyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6yFLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6yVLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv6yFLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6ylLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6y1LxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Bv6zFLxEeSXs5uRvkBeEQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6zVLxEeSXs5uRvkBeEQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Bv6zFLxEeSXs5uRvkBeEQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6zlLxEeSXs5uRvkBeEQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6z1LxEeSXs5uRvkBeEQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv60FLxEeSXs5uRvkBeEQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']"/>
       </ownedDiagramElements>
@@ -21943,11 +19390,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-8nQfEeGzhLaBlPZdWw"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUncVLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv601LxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv61FLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv601LxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv61VLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv61lLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21955,11 +19399,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-83QfEeGzhLaBlPZdWw"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUna1LyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv62FLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv62VLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv62FLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv62lLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv621LxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21967,11 +19408,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_6YL-9HQfEeGzhLaBlPZdWw"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnbVLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv63VLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv63lLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv63VLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv631LxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv64FLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21979,11 +19417,8 @@
           <target xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i1z44GuoEeKKE-qMx3PRKQ"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnZ1LyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv64lLxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv641LxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv64lLxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv65FLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv65VLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
@@ -21991,23 +19426,16 @@
           <target xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
           <semanticElements xmi:type="uml:Port" href="uml2.uml#_i12VIGuoEeKKE-qMx3PRKQ"/>
           <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUnalLyEeSXs5uRvkBeEQ"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv651LxEeSXs5uRvkBeEQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv66FLxEeSXs5uRvkBeEQ"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Bv651LxEeSXs5uRvkBeEQ" showIcon="false" color="114,159,207">
             <description xmi:type="style:BundledImageDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv66VLxEeSXs5uRvkBeEQ"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7Bv66lLxEeSXs5uRvkBeEQ" red="114" green="159" blue="207"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']"/>
         </ownedBorderedNodes>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Bv661LxEeSXs5uRvkBeEQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv67FLxEeSXs5uRvkBeEQ"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Bv661LxEeSXs5uRvkBeEQ" borderSize="1" borderSizeComputationExpression="1">
           <description xmi:type="style:FlatContainerStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv67VLxEeSXs5uRvkBeEQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv67lLxEeSXs5uRvkBeEQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv671LxEeSXs5uRvkBeEQ" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']"/>
       </ownedDiagramElements>
@@ -22017,7 +19445,6 @@
         <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_sGUndFLyEeSXs5uRvkBeEQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7Bv68VLxEeSXs5uRvkBeEQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv68lLxEeSXs5uRvkBeEQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -22027,7 +19454,6 @@
         <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_wKfncFLyEeSXs5uRvkBeEQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7Bv69FLxEeSXs5uRvkBeEQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv69VLxEeSXs5uRvkBeEQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -22037,7 +19463,6 @@
         <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_uqFkoFLyEeSXs5uRvkBeEQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7Bv691LxEeSXs5uRvkBeEQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6-FLxEeSXs5uRvkBeEQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -22047,7 +19472,6 @@
         <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_vS6fMFLyEeSXs5uRvkBeEQ"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7Bv6-lLxEeSXs5uRvkBeEQ" size="2" routingStyle="manhattan">
           <description xmi:type="style:EdgeStyleDescription" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_7Bv6-1LxEeSXs5uRvkBeEQ" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@edgeMappings[name='Deployment']"/>
       </ownedDiagramElements>
@@ -22056,6 +19480,5 @@
       <activatedLayers xmi:type="description_1:Layer" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer"/>
       <target xmi:type="uml:Model" href="uml2.uml#_Wh_KkEjgEd2dA-w4B9F6fQ"/>
     </ownedRepresentations>
-    <viewpoint xmi:type="description:Viewpoint" href="uml2.odesign#//@ownedViewpoints[name='UML%20Analysis%20workspace']"/>
   </ownedViews>
 </viewpoint:DAnalysis>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/Tux.svg b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/Tux.svg
new file mode 100644
index 0000000000..e48b735377
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/Tux.svg
@@ -0,0 +1,902 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="100%" width="100%" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 349.46883 405.12272">
+ <title>Tux</title>
+ <desc>For more information see: http://commons.wikimedia.org/wiki/Image:Tux.svg</desc>
+ <radialGradient id="ag" gradientUnits="userSpaceOnUse" cy="-551.04" cx="274.822" gradientTransform="matrix(.5671 0 0 -.2835 81.263 201.645)" r="165.384">
+  <stop stop-opacity=".502" offset="0"/>
+  <stop stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <path fill="url(#ag)" d="m330.892 357.885c0 25.898-41.989 46.893-93.785 46.893-51.795 0-93.784-20.994-93.784-46.893s41.989-46.893 93.784-46.893c51.795 0.001 93.785 20.995 93.785 46.893z"/>
+ <radialGradient id="ak" gradientUnits="userSpaceOnUse" cy="-551.042" cx="268.794" gradientTransform="matrix(.5823 0 0 -.2835 -61.6052 201.14)" r="165.383">
+  <stop stop-opacity=".502" offset="0"/>
+  <stop stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <path fill="url(#ak)" d="m191.223 357.381c0 25.897-43.117 46.892-96.306 46.892-53.188 0-96.305-20.994-96.305-46.892s43.117-46.893 96.305-46.893c53.188 0.001 96.306 20.995 96.306 46.893z"/>
+ <g transform="translate(8.99996 9.00046)">
+  <path d="m292.327 256.606c-4.752 19.584-28.872 60.48-41.688 78.48-12.815 18.072-11.231 34.344-34.92 28.008-23.616-6.336-30.24-5.184-54.647-3.744-24.265 1.439-19.009-0.721-34.2 6.12-15.12 6.84-65.88-82.944-69.984-99.647-4.031-16.705-5.976-14.689 4.536-32.761 10.513-18.071 12.024-35.928 25.92-57.816 13.896-21.96 29.952-33.12 28.8-49.896-4.535-62.28-8.136-93.384 19.513-107.784 26.352-13.68 48.384-5.544 57.096-0.864 3.744 2.016 11.376 5.904 17.064 12.744 5.688 6.696 10.8 16.848 13.68 29.664 5.904 25.704-2.448 17.208 4.248 46.656 6.624 29.375 20.088 43.775 36.504 67.031 16.414 23.257 33.55 61.633 28.078 83.809z"/>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#666" d="m148.47 94.049c4.319-1.728 3.592-1.958 6.472-8.222 2.304-4.824 4.328-6.898 4.256-14.242 0-7.2-2.232-9.648-5.616-14.328-3.24-4.464-8.424-4.68-11.664-4.104-1.872 0.288-4.319 2.664-5.976 6.192-1.08 2.376-1.944 5.4-2.017 8.568-0.216 8.496 0.505 11.736 2.448 17.496 2.305 6.769 7.921 10.297 12.097 8.64z"/>
+   <path fill="#6d6d6d" d="m148.47 94.023c4.293-1.717 3.563-1.954 6.425-8.178 2.289-4.793 4.312-6.861 4.271-14.164 0.027-7.152-2.162-9.702-5.488-14.201-3.296-4.345-8.376-4.509-11.593-3.953-1.916 0.283-4.354 2.569-6.038 5.968-1.159 2.31-2.016 5.353-2.087 8.535-0.212 8.438 0.547 11.691 2.46 17.417 2.268 6.731 7.901 10.221 12.05 8.576z"/>
+   <path fill="#757575" d="m148.471 93.996c4.264-1.706 3.533-1.95 6.377-8.133 2.273-4.762 4.296-6.823 4.288-14.085 0.053-7.105-2.093-9.756-5.363-14.075-3.35-4.225-8.327-4.338-11.52-3.801-1.961 0.278-4.389 2.474-6.099 5.744-1.242 2.245-2.089 5.305-2.16 8.501-0.207 8.38 0.591 11.647 2.473 17.34 2.231 6.691 7.881 10.144 12.004 8.509z"/>
+   <path fill="#7c7c7c" d="m148.471 93.969c4.235-1.694 3.506-1.946 6.329-8.089 2.26-4.731 4.28-6.786 4.304-14.006 0.081-7.058-2.021-9.811-5.236-13.948-3.403-4.105-8.278-4.167-11.446-3.649-2.006 0.273-4.424 2.379-6.16 5.519-1.322 2.179-2.161 5.257-2.232 8.468-0.202 8.323 0.636 11.603 2.486 17.261 2.191 6.654 7.859 10.068 11.955 8.444z"/>
+   <path fill="#848484" d="m148.471 93.943c4.209-1.684 3.477-1.942 6.282-8.045 2.245-4.7 4.266-6.749 4.319-13.928 0.107-7.01-1.95-9.864-5.109-13.821-3.458-3.985-8.23-3.996-11.375-3.498-2.049 0.268-4.458 2.284-6.222 5.295-1.403 2.114-2.233 5.21-2.303 8.435-0.198 8.265 0.679 11.559 2.498 17.183 2.156 6.615 7.842 9.992 11.91 8.379z"/>
+   <path fill="#8c8c8c" d="m148.471 93.916c4.181-1.672 3.448-1.938 6.235-8 2.23-4.668 4.249-6.711 4.335-13.85 0.134-6.962-1.88-9.918-4.982-13.695-3.513-3.865-8.183-3.825-11.303-3.347-2.094 0.263-4.492 2.189-6.283 5.07-1.484 2.049-2.306 5.163-2.375 8.401-0.193 8.207 0.723 11.515 2.511 17.105 2.118 6.58 7.821 9.919 11.862 8.316z"/>
+   <path fill="#939393" d="m148.472 93.889c4.152-1.661 3.419-1.934 6.188-7.956 2.215-4.638 4.233-6.674 4.35-13.771 0.161-6.915-1.809-9.972-4.854-13.568-3.567-3.746-8.134-3.654-11.23-3.195-2.138 0.259-4.527 2.094-6.345 4.847-1.564 1.983-2.378 5.115-2.447 8.368-0.188 8.149 0.767 11.47 2.523 17.026 2.079 6.54 7.8 9.841 11.815 8.249z"/>
+   <path fill="#9b9b9b" d="m148.472 93.863c4.125-1.65 3.391-1.93 6.141-7.912 2.2-4.607 4.217-6.637 4.366-13.693 0.188-6.868-1.739-10.026-4.729-13.441-3.621-3.626-8.085-3.484-11.157-3.044-2.183 0.253-4.562 1.999-6.406 4.622-1.646 1.918-2.45 5.068-2.52 8.335-0.185 8.091 0.811 11.426 2.535 16.948 2.044 6.502 7.782 9.766 11.77 8.185z"/>
+   <path fill="#a3a3a3" d="m148.472 93.836c4.097-1.639 3.361-1.926 6.094-7.867 2.185-4.576 4.201-6.599 4.382-13.614 0.214-6.82-1.669-10.081-4.603-13.315-3.676-3.506-8.036-3.313-11.084-2.893-2.229 0.249-4.598 1.904-6.47 4.398-1.726 1.852-2.521 5.021-2.591 8.301-0.18 8.034 0.854 11.382 2.548 16.87 2.008 6.465 7.763 9.691 11.724 8.12z"/>
+   <path fill="#aaa" d="m148.472 93.809c4.069-1.628 3.334-1.922 6.047-7.823 2.17-4.544 4.185-6.562 4.396-13.536 0.242-6.772-1.597-10.134-4.475-13.188-3.73-3.387-7.989-3.142-11.013-2.741-2.271 0.243-4.632 1.809-6.53 4.173-1.808 1.787-2.594 4.974-2.662 8.268-0.176 7.976 0.897 11.337 2.56 16.792 1.97 6.427 7.743 9.615 11.677 8.055z"/>
+   <path fill="#b2b2b2" d="m148.473 93.782c4.041-1.617 3.304-1.918 5.999-7.778 2.154-4.514 4.169-6.524 4.412-13.458 0.269-6.725-1.526-10.188-4.349-13.062-3.784-3.267-7.939-2.971-10.939-2.589-2.316 0.238-4.666 1.714-6.592 3.949-1.888 1.721-2.667 4.926-2.734 8.234-0.171 7.918 0.941 11.293 2.572 16.713 1.933 6.391 7.723 9.541 11.631 7.991z"/>
+   <path fill="#bababa" d="m148.473 93.756c4.014-1.606 3.275-1.914 5.951-7.734 2.141-4.482 4.153-6.487 4.43-13.379 0.295-6.678-1.457-10.243-4.223-12.935-3.839-3.147-7.892-2.8-10.867-2.438-2.36 0.233-4.701 1.619-6.653 3.725-1.969 1.656-2.739 4.879-2.806 8.201-0.167 7.86 0.984 11.249 2.585 16.636 1.895 6.35 7.702 9.462 11.583 7.924z"/>
+   <path fill="#c1c1c1" d="m148.473 93.729c3.985-1.595 3.247-1.91 5.904-7.69 2.125-4.451 4.138-6.45 4.445-13.3 0.321-6.63-1.387-10.297-4.096-12.808-3.894-3.028-7.844-2.629-10.795-2.287-2.405 0.229-4.735 1.524-6.716 3.5-2.049 1.59-2.811 4.831-2.878 8.167-0.161 7.802 1.029 11.205 2.599 16.557 1.859 6.314 7.683 9.389 11.537 7.861z"/>
+   <path fill="#c9c9c9" d="m148.473 93.702c3.958-1.583 3.219-1.906 5.857-7.646 2.11-4.42 4.121-6.412 4.46-13.222 0.35-6.583-1.315-10.351-3.969-12.682-3.947-2.908-7.794-2.458-10.722-2.135-2.45 0.224-4.771 1.429-6.777 3.276-2.13 1.525-2.883 4.784-2.95 8.135-0.157 7.745 1.073 11.16 2.611 16.479 1.821 6.276 7.663 9.313 11.49 7.795z"/>
+   <path fill="#d1d1d1" d="m148.474 93.676c3.93-1.573 3.188-1.902 5.809-7.601 2.097-4.389 4.107-6.375 4.477-13.144 0.375-6.535-1.245-10.404-3.842-12.555-4.002-2.788-7.747-2.287-10.65-1.984-2.493 0.219-4.805 1.334-6.837 3.052-2.213 1.459-2.957 4.736-3.022 8.101-0.153 7.687 1.116 11.116 2.623 16.401 1.782 6.237 7.642 9.237 11.442 7.73z"/>
+   <path fill="#d8d8d8" d="m148.474 93.649c3.901-1.562 3.16-1.898 5.762-7.557 2.082-4.358 4.091-6.338 4.493-13.065 0.401-6.487-1.176-10.458-3.716-12.428-4.057-2.668-7.698-2.116-10.578-1.832-2.538 0.214-4.839 1.239-6.899 2.827-2.292 1.394-3.029 4.689-3.094 8.068-0.148 7.629 1.16 11.072 2.636 16.322 1.746 6.2 7.623 9.161 11.396 7.665z"/>
+   <path fill="#e0e0e0" d="m148.474 93.622c3.875-1.55 3.132-1.894 5.715-7.512 2.066-4.327 4.075-6.3 4.508-12.987 0.429-6.44-1.104-10.513-3.588-12.302-4.111-2.549-7.65-1.945-10.506-1.681-2.582 0.209-4.874 1.144-6.961 2.604-2.373 1.328-3.102 4.642-3.165 8.034-0.145 7.571 1.204 11.027 2.647 16.244 1.709 6.162 7.604 9.086 11.35 7.6z"/>
+   <path fill="#e8e8e8" d="m148.474 93.596c3.847-1.54 3.104-1.89 5.668-7.468 2.052-4.296 4.059-6.263 4.523-12.908 0.456-6.393-1.034-10.567-3.462-12.175-4.165-2.429-7.601-1.774-10.433-1.529-2.627 0.204-4.908 1.049-7.023 2.379-2.453 1.263-3.173 4.594-3.236 8.001-0.141 7.514 1.247 10.983 2.659 16.166 1.673 6.123 7.585 9.008 11.304 7.534z"/>
+   <path fill="#efefef" d="m148.475 93.569c3.817-1.528 3.073-1.886 5.62-7.424 2.036-4.265 4.043-6.226 4.539-12.83 0.482-6.345-0.964-10.621-3.336-12.048-4.219-2.31-7.552-1.604-10.359-1.378-2.672 0.199-4.943 0.954-7.084 2.155-2.535 1.197-3.246 4.546-3.311 7.967-0.135 7.456 1.292 10.939 2.673 16.087 1.636 6.087 7.565 8.935 11.258 7.471z"/>
+   <path fill="#f7f7f7" d="m148.475 93.542c3.791-1.517 3.046-1.882 5.572-7.379 2.022-4.234 4.027-6.188 4.556-12.751 0.51-6.297-0.894-10.675-3.208-11.921-4.274-2.19-7.505-1.433-10.289-1.227-2.715 0.194-4.978 0.859-7.146 1.93-2.614 1.132-3.317 4.5-3.381 7.935-0.131 7.398 1.335 10.895 2.686 16.009 1.597 6.047 7.544 8.858 11.21 7.404z"/>
+   <path fill="#fff" d="m148.475 93.516c3.763-1.506 3.017-1.878 5.525-7.335 2.007-4.203 4.012-6.151 4.571-12.673 0.536-6.25-0.823-10.729-3.082-11.795-4.328-2.07-7.456-1.262-10.216-1.075-2.76 0.189-5.012 0.764-7.207 1.706-2.696 1.066-3.39 4.452-3.453 7.901-0.126 7.34 1.379 10.85 2.698 15.931 1.561 6.01 7.525 8.782 11.164 7.34z"/>
+  </g>
+  <path d="m132.033 74.7465c2.16 0 4.896 1.44 6.191 3.384 1.368 1.944 2.376 4.68 2.376 7.776 0 4.608-0.504 9.72-3.239 11.304-0.864 0.504-2.736 0.936-3.816 0.936-2.448 0-2.664-1.584-4.968-3.96-0.792-0.864-3.168-5.04-3.168-8.496 0-2.16-0.504-5.256 1.368-7.992 1.296-2.016 2.952-2.952 5.256-2.952z"/>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m143.862 68.608c0.844-1.305 4.222-0.69 5.45 1.996 1.229 2.687 0.998 8.522 0.153 8.829-2.226 0.691-1.535-2.534-3.454-5.451-1.919-2.762-2.994-4.067-2.149-5.374z"/>
+   <path fill="#070707" d="m143.916 68.664c0.833-1.289 4.169-0.681 5.381 1.971 1.215 2.653 0.985 8.414 0.152 8.717-2.198 0.682-1.516-2.502-3.411-5.382-1.895-2.728-2.956-4.017-2.122-5.306z"/>
+   <path fill="#0f0f0f" d="m143.97 68.719c0.822-1.272 4.114-0.673 5.312 1.945 1.198 2.619 0.973 8.306 0.15 8.605-2.169 0.673-1.497-2.47-3.367-5.313-1.871-2.692-2.918-3.964-2.095-5.237z"/>
+   <path fill="#161616" d="m144.024 68.774c0.812-1.255 4.062-0.664 5.243 1.92 1.182 2.585 0.96 8.198 0.147 8.493-2.141 0.665-1.477-2.438-3.323-5.244-1.846-2.657-2.88-3.913-2.067-5.169z"/>
+   <path fill="#1e1e1e" d="m144.078 68.829c0.801-1.239 4.008-0.655 5.174 1.895 1.167 2.551 0.947 8.09 0.146 8.381-2.113 0.656-1.458-2.405-3.28-5.174-1.821-2.623-2.842-3.863-2.04-5.102z"/>
+   <path fill="#262626" d="m144.132 68.884c0.791-1.222 3.955-0.646 5.105 1.87 1.151 2.517 0.935 7.982 0.144 8.27-2.085 0.647-1.438-2.374-3.235-5.105-1.798-2.589-2.805-3.812-2.014-5.035z"/>
+   <path fill="#2d2d2d" d="m144.186 68.939c0.779-1.206 3.9-0.638 5.036 1.844 1.135 2.483 0.922 7.874 0.142 8.158-2.057 0.639-1.419-2.341-3.192-5.037-1.773-2.552-2.766-3.758-1.986-4.965z"/>
+   <path fill="#353535" d="m144.24 68.994c0.769-1.189 3.848-0.629 4.967 1.819 1.12 2.449 0.909 7.766 0.141 8.046-2.028 0.629-1.399-2.31-3.148-4.967-1.75-2.518-2.73-3.708-1.96-4.898z"/>
+   <path fill="#3d3d3d" d="m144.294 69.049c0.76-1.172 3.794-0.621 4.898 1.793 1.104 2.415 0.896 7.658 0.138 7.934-2 0.621-1.38-2.277-3.104-4.898-1.725-2.482-2.691-3.655-1.932-4.829z"/>
+   <path fill="#444" d="m144.348 69.104c0.748-1.156 3.74-0.612 4.829 1.768 1.088 2.38 0.884 7.55 0.136 7.822-1.973 0.612-1.36-2.245-3.062-4.829-1.699-2.448-2.651-3.604-1.903-4.761z"/>
+   <path fill="#4c4c4c" d="m144.402 69.16c0.737-1.14 3.687-0.603 4.76 1.743 1.073 2.347 0.871 7.442 0.134 7.71-1.943 0.604-1.341-2.213-3.017-4.76-1.676-2.414-2.614-3.554-1.877-4.693z"/>
+   <path fill="#545454" d="m144.456 69.215c0.727-1.123 3.634-0.595 4.691 1.717 1.057 2.313 0.857 7.334 0.132 7.598-1.916 0.595-1.321-2.181-2.973-4.691-1.652-2.378-2.577-3.501-1.85-4.624z"/>
+   <path fill="#5b5b5b" d="m144.51 69.27c0.717-1.106 3.58-0.585 4.622 1.692 1.041 2.278 0.847 7.226 0.131 7.486-1.888 0.586-1.303-2.149-2.93-4.622-1.628-2.343-2.539-3.45-1.823-4.556z"/>
+   <path fill="#636363" d="m144.564 69.325c0.705-1.09 3.526-0.577 4.553 1.667 1.026 2.245 0.833 7.118 0.128 7.375-1.858 0.577-1.282-2.117-2.885-4.553-1.604-2.309-2.501-3.399-1.796-4.489z"/>
+   <path fill="#6b6b6b" d="m144.618 69.38c0.694-1.073 3.473-0.568 4.483 1.642 1.011 2.21 0.82 7.01 0.127 7.263-1.831 0.568-1.264-2.084-2.842-4.484-1.578-2.274-2.462-3.347-1.768-4.421z"/>
+   <path fill="#727272" d="m144.672 69.435c0.685-1.057 3.42-0.56 4.414 1.617 0.995 2.176 0.81 6.902 0.125 7.15-1.803 0.56-1.243-2.053-2.798-4.415-1.554-2.238-2.425-3.295-1.741-4.352z"/>
+   <path fill="#7a7a7a" d="m144.726 69.49c0.673-1.041 3.365-0.551 4.345 1.591 0.979 2.143 0.796 6.794 0.123 7.039-1.775 0.551-1.224-2.021-2.754-4.346-1.53-2.203-2.387-3.244-1.714-4.284z"/>
+   <path fill="#828282" d="m144.78 69.545c0.662-1.023 3.313-0.542 4.276 1.566 0.964 2.108 0.782 6.686 0.121 6.926-1.746 0.542-1.204-1.988-2.711-4.276-1.505-2.167-2.348-3.192-1.686-4.216z"/>
+   <path fill="#898989" d="m144.834 69.6c0.652-1.007 3.259-0.533 4.207 1.541s0.771 6.578 0.119 6.815c-1.718 0.534-1.185-1.956-2.666-4.207-1.482-2.134-2.311-3.142-1.66-4.149z"/>
+   <path fill="#919191" d="m144.888 69.655c0.641-0.99 3.206-0.524 4.138 1.516 0.933 2.04 0.758 6.47 0.117 6.703-1.69 0.525-1.165-1.924-2.623-4.138-1.457-2.098-2.273-3.09-1.632-4.081z"/>
+   <path fill="#999" d="m144.942 69.71c0.63-0.974 3.152-0.516 4.069 1.49s0.744 6.362 0.114 6.591c-1.662 0.516-1.146-1.892-2.579-4.069-1.432-2.062-2.234-3.037-1.604-4.012z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#666" d="m193.11 94.985c10.8-1.152 14.616-5.328 16.56-12.6 1.729-6.48 1.801-13.68-3.023-22.104-4.536-8.063-7.128-9.36-13.681-9.864-10.079-0.864-14.832 6.192-17.063 11.232-2.376 5.472-1.872 4.68-1.729 11.592 0.145 7.272 4.245 9.299 6.766 13.835 2.519 4.465 10.946 7.982 12.17 7.909z"/>
+   <path fill="#6d6d6d" d="m193.115 94.944c10.759-1.131 14.618-5.354 16.515-12.569 1.701-6.525 1.785-13.686-3.002-21.912-4.434-7.797-7.038-9.081-13.512-9.581-10.049-0.861-14.941 5.873-17.181 10.874-2.304 5.28-1.878 4.718-1.726 11.539 0.16 7.268 4.268 9.223 6.784 13.76 2.521 4.475 10.898 7.962 12.122 7.889z"/>
+   <path fill="#757575" d="m193.12 94.902c10.718-1.11 14.62-5.379 16.469-12.538 1.676-6.57 1.771-13.692-2.979-21.721-4.331-7.53-6.947-8.801-13.344-9.297-10.018-0.858-15.05 5.553-17.298 10.516-2.229 5.087-1.885 4.757-1.722 11.487 0.176 7.264 4.289 9.146 6.803 13.686 2.52 4.485 10.848 7.942 12.071 7.867z"/>
+   <path fill="#7c7c7c" d="m193.126 94.861c10.675-1.09 14.621-5.405 16.423-12.507 1.648-6.616 1.756-13.698-2.958-21.529-4.229-7.263-6.856-8.522-13.176-9.014-9.985-0.854-15.158 5.234-17.414 10.158-2.156 4.895-1.891 4.795-1.719 11.434 0.193 7.26 4.31 9.07 6.822 13.611 2.52 4.495 10.798 7.922 12.022 7.847z"/>
+   <path fill="#848484" d="m193.131 94.82c10.635-1.069 14.623-5.431 16.377-12.476 1.622-6.661 1.741-13.704-2.936-21.337-4.126-6.996-6.767-8.242-13.008-8.73-9.955-0.852-15.267 4.915-17.53 9.8-2.084 4.703-1.896 4.833-1.716 11.38 0.209 7.256 4.332 8.995 6.841 13.537 2.52 4.505 10.748 7.902 11.972 7.826z"/>
+   <path fill="#8c8c8c" d="m193.136 94.778c10.593-1.048 14.625-5.457 16.331-12.445 1.596-6.706 1.726-13.709-2.913-21.145-4.025-6.729-6.678-7.963-12.841-8.447-9.924-0.848-15.375 4.595-17.647 9.441-2.01 4.51-1.903 4.872-1.712 11.328 0.225 7.251 4.354 8.918 6.858 13.462 2.521 4.517 10.7 7.883 11.924 7.806z"/>
+   <path fill="#939393" d="m193.141 94.737c10.552-1.027 14.627-5.482 16.286-12.414 1.568-6.751 1.711-13.715-2.893-20.954-3.922-6.462-6.586-7.683-12.672-8.163-9.892-0.845-15.483 4.276-17.764 9.083-1.938 4.318-1.909 4.91-1.709 11.275 0.24 7.247 4.375 8.842 6.878 13.387 2.521 4.528 10.651 7.863 11.874 7.786z"/>
+   <path fill="#9b9b9b" d="m193.146 94.695c10.51-1.007 14.63-5.508 16.241-12.382 1.542-6.796 1.694-13.721-2.87-20.762-3.82-6.195-6.496-7.404-12.504-7.879-9.861-0.842-15.592 3.956-17.882 8.725-1.863 4.126-1.915 4.949-1.706 11.223 0.258 7.243 4.397 8.766 6.897 13.313 2.521 4.535 10.601 7.841 11.824 7.762z"/>
+   <path fill="#a3a3a3" d="m193.151 94.654c10.469-0.986 14.632-5.534 16.196-12.351 1.515-6.842 1.68-13.727-2.85-20.57-3.717-5.928-6.405-7.125-12.335-7.596-9.83-0.839-15.7 3.637-17.998 8.367-1.791 3.933-1.922 4.987-1.703 11.169 0.273 7.239 4.419 8.689 6.916 13.238 2.521 4.547 10.551 7.822 11.774 7.743z"/>
+   <path fill="#aaa" d="m193.157 94.612c10.427-0.965 14.633-5.56 16.149-12.32 1.488-6.887 1.666-13.733-2.826-20.379-3.615-5.661-6.316-6.845-12.168-7.313-9.799-0.835-15.809 3.317-18.114 8.009-1.718 3.741-1.928 5.025-1.7 11.117 0.29 7.235 4.44 8.613 6.936 13.163 2.519 4.558 10.499 7.804 11.723 7.723z"/>
+   <path fill="#b2b2b2" d="m193.162 94.571c10.386-0.944 14.635-5.585 16.104-12.289 1.462-6.932 1.649-13.739-2.806-20.188-3.512-5.394-6.225-6.565-11.999-7.029-9.768-0.833-15.917 2.998-18.23 7.651-1.646 3.549-1.935 5.064-1.697 11.064 0.306 7.231 4.462 8.537 6.954 13.088 2.52 4.569 10.451 7.784 11.674 7.703z"/>
+   <path fill="#bababa" d="m193.167 94.529c10.345-0.923 14.638-5.611 16.059-12.258 1.436-6.977 1.636-13.744-2.782-19.995-3.41-5.127-6.135-6.286-11.832-6.746-9.736-0.829-16.025 2.679-18.347 7.293-1.572 3.356-1.941 5.103-1.694 11.011 0.322 7.227 4.484 8.461 6.973 13.014 2.519 4.579 10.4 7.764 11.623 7.681z"/>
+   <path fill="#c1c1c1" d="m193.172 94.488c10.304-0.903 14.64-5.637 16.014-12.227 1.409-7.022 1.62-13.75-2.762-19.804-3.308-4.86-6.044-6.006-11.662-6.462-9.705-0.826-16.135 2.359-18.466 6.935-1.498 3.164-1.945 5.141-1.689 10.958 0.338 7.223 4.506 8.385 6.991 12.939 2.519 4.59 10.351 7.744 11.574 7.661z"/>
+   <path fill="#c9c9c9" d="m193.177 94.447c10.262-0.882 14.641-5.663 15.967-12.196 1.383-7.068 1.605-13.756-2.738-19.612-3.206-4.593-5.954-5.727-11.496-6.179-9.673-0.823-16.242 2.04-18.581 6.577-1.425 2.972-1.952 5.179-1.687 10.906 0.354 7.219 4.526 8.308 7.01 12.865 2.52 4.598 10.302 7.723 11.525 7.639z"/>
+   <path fill="#d1d1d1" d="m193.182 94.405c10.221-0.861 14.643-5.688 15.922-12.165 1.355-7.113 1.591-13.762-2.717-19.42-3.104-4.326-5.864-5.448-11.327-5.895-9.644-0.82-16.352 1.721-18.698 6.219-1.353 2.779-1.959 5.217-1.684 10.853 0.369 7.214 4.549 8.232 7.028 12.79 2.521 4.609 10.254 7.703 11.476 7.618z"/>
+   <path fill="#d8d8d8" d="m193.187 94.364c10.179-0.841 14.645-5.714 15.876-12.133 1.33-7.158 1.576-13.768-2.694-19.229-3.001-4.059-5.773-5.168-11.16-5.612-9.61-0.817-16.459 1.401-18.813 5.861-1.279 2.586-1.965 5.256-1.682 10.8 0.387 7.21 4.571 8.156 7.049 12.715 2.519 4.619 10.202 7.684 11.424 7.598z"/>
+   <path fill="#e0e0e0" d="m193.193 94.322c10.137-0.82 14.646-5.74 15.83-12.103 1.303-7.203 1.561-13.773-2.673-19.037-2.898-3.792-5.684-4.889-10.991-5.328-9.58-0.813-16.568 1.082-18.931 5.502-1.206 2.395-1.972 5.294-1.679 10.747 0.403 7.207 4.592 8.08 7.067 12.641 2.521 4.631 10.154 7.666 11.377 7.578z"/>
+   <path fill="#e8e8e8" d="m193.198 94.281c10.096-0.799 14.648-5.766 15.785-12.071 1.275-7.249 1.545-13.779-2.651-18.845-2.796-3.525-5.593-4.609-10.823-5.044-9.549-0.81-16.677 0.762-19.048 5.145-1.133 2.202-1.978 5.333-1.675 10.694 0.419 7.202 4.614 8.003 7.086 12.566 2.52 4.638 10.103 7.643 11.326 7.555z"/>
+   <path fill="#efefef" d="m193.203 94.239c10.055-0.778 14.65-5.792 15.739-12.04 1.25-7.293 1.531-13.785-2.629-18.653-2.694-3.258-5.502-4.33-10.655-4.761-9.517-0.807-16.785 0.443-19.165 4.786-1.059 2.01-1.983 5.372-1.671 10.642 0.435 7.198 4.636 7.928 7.104 12.492 2.52 4.649 10.055 7.624 11.277 7.534z"/>
+   <path fill="#f7f7f7" d="m193.208 94.198c10.014-0.757 14.652-5.817 15.694-12.009 1.223-7.339 1.516-13.792-2.607-18.462-2.592-2.991-5.413-4.05-10.486-4.478-9.487-0.804-16.895 0.124-19.282 4.428-0.986 1.817-1.989 5.41-1.668 10.589 0.451 7.194 4.657 7.851 7.123 12.417 2.519 4.661 10.004 7.605 11.226 7.515z"/>
+   <path fill="#fff" d="m193.213 94.156c9.973-0.737 14.654-5.843 15.648-11.978 1.197-7.384 1.501-13.797-2.585-18.27-2.489-2.724-5.322-3.771-10.319-4.194-9.455-0.801-17.002-0.196-19.397 4.07-0.913 1.625-1.996 5.448-1.665 10.536 0.467 7.19 4.679 7.775 7.142 12.342 2.519 4.671 9.954 7.586 11.176 7.494z"/>
+  </g>
+  <path d="m179.841 74.4585c5.4 0 8.568 4.824 9.648 11.016 0.432 2.808-0.216 6.048-1.944 8.28-1.944 2.592-5.4 4.176-8.208 4.176-2.664 0-5.688 0.432-7.271-1.728-1.584-2.232-1.944-7.2-1.944-10.728 0-3.96 1.152-6.768 3.168-9 1.511-1.657 4.247-2.016 6.551-2.016z"/>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m192.591 66.68c0.98-0.653 2.612 0 4.489 2.122 2.039 2.285 2.938 4.08 0.489 5.385-1.877 0.98-2.448-1.958-3.59-3.182-1.795-1.959-3.346-3.02-1.388-4.325z"/>
+   <path fill="#070707" d="m192.631 66.738c0.96-0.649 2.573 0 4.423 2.09 2.009 2.251 2.864 4.02 0.481 5.305-1.837 0.977-2.403-1.929-3.525-3.135-1.768-1.925-3.296-2.965-1.379-4.26z"/>
+   <path fill="#0f0f0f" d="m192.671 66.797c0.939-0.645 2.534 0 4.356 2.059 1.978 2.217 2.792 3.958 0.474 5.225-1.798 0.974-2.357-1.9-3.46-3.087-1.742-1.895-3.247-2.913-1.37-4.197z"/>
+   <path fill="#161616" d="m192.711 66.855c0.919-0.641 2.495 0 4.289 2.027 1.948 2.184 2.721 3.898 0.467 5.146-1.759 0.971-2.313-1.871-3.396-3.041-1.715-1.861-3.197-2.858-1.36-4.132z"/>
+   <path fill="#1e1e1e" d="m192.751 66.914c0.899-0.637 2.457 0 4.223 1.996 1.918 2.149 2.647 3.838 0.46 5.065-1.72 0.968-2.269-1.842-3.331-2.993-1.689-1.83-3.148-2.805-1.352-4.068z"/>
+   <path fill="#262626" d="m192.791 66.973c0.878-0.633 2.418 0 4.155 1.964 1.888 2.116 2.576 3.777 0.453 4.986-1.68 0.965-2.224-1.813-3.267-2.946-1.661-1.798-3.097-2.752-1.341-4.004z"/>
+   <path fill="#2d2d2d" d="m192.831 67.031c0.858-0.629 2.379 0 4.089 1.933 1.857 2.082 2.503 3.717 0.445 4.906-1.641 0.961-2.178-1.784-3.201-2.898-1.636-1.767-3.048-2.7-1.333-3.941z"/>
+   <path fill="#353535" d="m192.87 67.09c0.838-0.625 2.341 0 4.023 1.902 1.827 2.047 2.431 3.656 0.438 4.826-1.601 0.958-2.133-1.755-3.137-2.852-1.608-1.735-2.998-2.646-1.324-3.876z"/>
+   <path fill="#3d3d3d" d="m192.91 67.148c0.818-0.621 2.302 0 3.956 1.87 1.797 2.014 2.359 3.596 0.431 4.746-1.562 0.956-2.088-1.726-3.071-2.804-1.583-1.702-2.95-2.592-1.316-3.812z"/>
+   <path fill="#444" d="m192.95 67.207c0.798-0.617 2.263 0 3.889 1.839 1.768 1.98 2.287 3.535 0.425 4.666-1.523 0.952-2.043-1.697-3.008-2.757-1.556-1.671-2.899-2.539-1.306-3.748z"/>
+   <path fill="#4c4c4c" d="m192.99 67.266c0.777-0.614 2.224 0 3.823 1.807 1.735 1.946 2.214 3.474 0.416 4.586-1.483 0.949-1.998-1.667-2.942-2.709-1.529-1.639-2.85-2.486-1.297-3.684z"/>
+   <path fill="#545454" d="m193.03 67.325c0.757-0.61 2.185 0 3.756 1.775 1.706 1.912 2.143 3.414 0.409 4.506-1.444 0.946-1.953-1.639-2.878-2.663-1.502-1.606-2.799-2.431-1.287-3.618z"/>
+   <path fill="#5b5b5b" d="m193.07 67.383c0.736-0.605 2.146 0 3.688 1.744 1.677 1.878 2.07 3.353 0.402 4.426-1.405 0.943-1.908-1.609-2.813-2.615-1.475-1.575-2.749-2.378-1.277-3.555z"/>
+   <path fill="#636363" d="m193.11 67.442c0.716-0.602 2.106 0 3.622 1.712 1.646 1.844 1.998 3.293 0.395 4.347-1.364 0.94-1.862-1.581-2.748-2.568-1.449-1.543-2.701-2.326-1.269-3.491z"/>
+   <path fill="#6b6b6b" d="m193.15 67.5c0.696-0.598 2.069 0 3.556 1.681 1.615 1.811 1.925 3.232 0.387 4.267-1.325 0.937-1.818-1.552-2.683-2.521-1.423-1.511-2.651-2.272-1.26-3.427z"/>
+   <path fill="#727272" d="m193.19 67.559c0.675-0.594 2.03 0 3.489 1.649 1.585 1.777 1.853 3.172 0.38 4.187-1.287 0.935-1.774-1.522-2.619-2.473-1.396-1.48-2.601-2.219-1.25-3.363z"/>
+   <path fill="#7a7a7a" d="m193.23 67.618c0.654-0.59 1.991 0 3.422 1.618 1.555 1.743 1.781 3.111 0.373 4.107-1.247 0.931-1.729-1.494-2.554-2.426-1.369-1.448-2.551-2.166-1.241-3.299z"/>
+   <path fill="#828282" d="m193.269 67.677c0.635-0.586 1.953 0 3.355 1.586 1.525 1.708 1.709 3.05 0.366 4.026-1.208 0.928-1.684-1.464-2.489-2.378-1.342-1.416-2.501-2.112-1.232-3.234z"/>
+   <path fill="#898989" d="m193.309 67.735c0.614-0.582 1.914 0 3.29 1.555 1.493 1.675 1.636 2.99 0.357 3.947-1.169 0.925-1.639-1.435-2.424-2.332-1.316-1.384-2.452-2.058-1.223-3.17z"/>
+   <path fill="#919191" d="m193.349 67.794c0.595-0.578 1.875 0 3.223 1.523 1.464 1.641 1.564 2.93 0.351 3.867-1.129 0.922-1.594-1.406-2.359-2.284-1.29-1.352-2.403-2.005-1.215-3.106z"/>
+   <path fill="#999" d="m193.389 67.853c0.573-0.574 1.836 0 3.155 1.492 1.435 1.607 1.492 2.869 0.345 3.787-1.091 0.919-1.55-1.377-2.295-2.237-1.263-1.32-2.353-1.953-1.205-3.042z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m165.498 69.906c1.693-0.654 3.012-0.69 5.63 1.036 3.166 2.088 1.705 5.245-0.779 4.601-2.146-0.556-2.417-0.681-4.391-1.086-3.101-0.648-3.641-3.322-0.46-4.551z"/>
+   <path fill="#050505" d="m165.564 70.033c1.658-0.629 2.973-0.656 5.555 1.026 3.066 2.009 1.654 5.012-0.805 4.38-2.131-0.547-2.345-0.656-4.284-1.052-3.055-0.634-3.587-3.173-0.466-4.354z"/>
+   <path fill="#0a0a0a" d="m165.63 70.16c1.623-0.604 2.935-0.622 5.481 1.015 2.965 1.93 1.602 4.779-0.83 4.159-2.119-0.539-2.274-0.63-4.179-1.018-3.009-0.618-3.533-3.022-0.472-4.156z"/>
+   <path fill="#0f0f0f" d="m165.696 70.287c1.587-0.579 2.895-0.587 5.406 1.005 2.864 1.851 1.551 4.546-0.855 3.938-2.105-0.53-2.203-0.605-4.073-0.983-2.963-0.604-3.48-2.873-0.478-3.96z"/>
+   <path fill="#141414" d="m165.761 70.413c1.553-0.553 2.856-0.553 5.331 0.995 2.766 1.772 1.5 4.313-0.88 3.717-2.092-0.521-2.131-0.58-3.967-0.949-2.916-0.588-3.425-2.723-0.484-3.763z"/>
+   <path fill="#191919" d="m165.827 70.54c1.519-0.528 2.818-0.519 5.258 0.984 2.664 1.693 1.448 4.079-0.905 3.497-2.079-0.513-2.06-0.554-3.861-0.915-2.873-0.573-3.373-2.573-0.492-3.566z"/>
+   <path fill="#1e1e1e" d="m165.893 70.667c1.482-0.503 2.778-0.484 5.183 0.974 2.564 1.614 1.397 3.846-0.93 3.276-2.067-0.504-1.989-0.529-3.756-0.88-2.826-0.559-3.319-2.425-0.497-3.37z"/>
+   <path fill="#232323" d="m165.959 70.793c1.447-0.478 2.74-0.45 5.108 0.964 2.464 1.535 1.345 3.613-0.955 3.055-2.053-0.496-1.917-0.503-3.651-0.846-2.779-0.543-3.264-2.274-0.502-3.173z"/>
+   <path fill="#282828" d="m166.025 70.92c1.412-0.453 2.701-0.416 5.034 0.954 2.362 1.456 1.293 3.38-0.981 2.834-2.04-0.487-1.845-0.478-3.545-0.812-2.733-0.528-3.21-2.125-0.508-2.976z"/>
+   <path fill="#2d2d2d" d="m166.09 71.047c1.378-0.428 2.663-0.382 4.96 0.943 2.264 1.377 1.242 3.146-1.006 2.613-2.026-0.478-1.773-0.453-3.438-0.777-2.688-0.513-3.158-1.974-0.516-2.779z"/>
+   <path fill="#333" d="m166.156 71.173c1.343-0.402 2.624-0.347 4.885 0.933 2.163 1.298 1.191 2.914-1.029 2.392-2.015-0.47-1.703-0.428-3.334-0.743-2.642-0.498-3.104-1.824-0.522-2.582z"/>
+   <path fill="#383838" d="m166.222 71.3c1.307-0.377 2.585-0.313 4.81 0.922 2.063 1.219 1.14 2.681-1.055 2.171-2.001-0.461-1.631-0.402-3.229-0.708-2.594-0.483-3.048-1.674-0.526-2.385z"/>
+   <path fill="#3d3d3d" d="m166.288 71.427c1.272-0.352 2.546-0.279 4.736 0.913 1.962 1.14 1.088 2.447-1.081 1.95-1.988-0.452-1.56-0.377-3.122-0.674-2.55-0.469-2.995-1.526-0.533-2.189z"/>
+   <path fill="#424242" d="m166.354 71.554c1.236-0.327 2.507-0.245 4.661 0.902 1.861 1.061 1.037 2.214-1.106 1.729-1.974-0.444-1.488-0.352-3.016-0.64-2.504-0.453-2.942-1.375-0.539-1.991z"/>
+   <path fill="#474747" d="m166.419 71.68c1.203-0.302 2.469-0.21 4.587 0.892 1.762 0.982 0.986 1.98-1.13 1.508-1.962-0.435-1.417-0.326-2.911-0.606-2.458-0.437-2.888-1.224-0.546-1.794z"/>
+   <path fill="#4c4c4c" d="m166.485 71.807c1.167-0.276 2.429-0.176 4.513 0.882 1.66 0.903 0.935 1.748-1.156 1.288-1.948-0.426-1.345-0.301-2.805-0.572-2.412-0.423-2.834-1.076-0.552-1.598z"/>
+   <path fill="#515151" d="m166.551 71.934c1.133-0.251 2.391-0.142 4.438 0.871 1.56 0.824 0.883 1.515-1.181 1.067-1.936-0.417-1.274-0.275-2.699-0.537-2.366-0.408-2.781-0.926-0.558-1.401z"/>
+   <path fill="#565656" d="m166.617 72.061c1.097-0.227 2.351-0.108 4.363 0.861 1.46 0.745 0.831 1.281-1.206 0.846-1.922-0.409-1.202-0.25-2.594-0.503-2.319-0.393-2.726-0.777-0.563-1.204z"/>
+   <path fill="#5b5b5b" d="m166.683 72.187c1.062-0.201 2.312-0.073 4.289 0.851 1.358 0.666 0.778 1.048-1.231 0.625-1.91-0.4-1.131-0.225-2.489-0.469-2.274-0.377-2.672-0.626-0.569-1.007z"/>
+   <path fill="#606060" d="m166.748 72.314c1.027-0.176 2.274-0.04 4.215 0.84 1.26 0.587 0.729 0.815-1.256 0.404-1.896-0.392-1.06-0.2-2.383-0.435-2.228-0.361-2.619-0.475-0.576-0.809z"/>
+   <path fill="#666" d="m166.814 72.44c0.992-0.151 2.234-0.005 4.14 0.83 1.159 0.508 0.677 0.582-1.281 0.183-1.883-0.383-0.987-0.174-2.276-0.4-2.183-0.346-2.566-0.325-0.583-0.613z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#666" d="m159.99 128.249c-9.36 0.36-24.192-25.848-24.552-14.976-0.288 9.216 0.216 9.072 0.216 18 0 5.976-2.736 6.408-8.64 15.408-3.024 4.752-5.4 9.864-7.272 15.048-1.152 3.096-2.232 6.336-3.096 9.504-0.36 1.584-1.008 3.24-1.368 4.824-2.952 10.872-13.464 24.264-15.912 35.136-2.448 10.8-5.328 17.712-4.968 32.185 0.36 14.472 0.504 10.295 4.896 13.896 4.32 3.601 8.784 6.983 15.624 13.032 7.2 6.264 22.177 17.208 24.192 20.592 2.16 3.456 2.088 11.232 0.792 13.752-1.296 2.448-12.6 3.816-12.528 3.816-0.071 0 9.864 13.68 11.809 15.623 1.872 1.873 9.936 10.873 42.768 4.752 18.504-3.455 32.832-13.823 43.2-23.832 13.392-13.031 6.624-16.775 8.352-23.327 2.521-9.433 10.729-12.96 12.601-23.616 0.216-1.512 0.72-2.664 2.088-4.896 2.088-3.168 1.584-9.432 1.584-15.191 0-14.977-1.729-30.24-5.185-41.472-3.168-10.512-8.208-17.856-12.527-27.36-8.641-18.936-8.208-27.432-15.912-39.528-8.784-13.968-4.464-23.256-16.128-22.68-14.546 0.79-26.282 20.734-40.034 21.31z"/>
+   <path fill="#6d6d6d" d="m159.973 129.334c-9.281 0.353-23.746-25.511-24.242-15.179-0.316 8.755 0.1 8.678 0.03 17.247-0.15 5.87-2.953 6.637-8.727 15.481-3.013 4.763-5.273 9.812-6.993 14.877-0.968 3.253-1.56 6.422-2.43 9.526-0.415 1.642-1.497 3.187-2.185 5.042-3.254 10.78-13.545 24.182-15.961 34.877-2.466 10.81-5.37 17.694-4.961 32.141 0.366 14 0.395 10.177 4.773 13.816 4.283 3.616 8.839 7.069 15.662 13.103 7.183 6.248 22.237 17.216 24.243 20.588 2.149 3.444 2.131 11.317 0.844 13.823-1.284 2.439-12.579 3.875-12.508 3.875-0.071 0 9.815 13.566 11.757 15.508 1.87 1.87 9.902 10.809 42.678 4.704 18.524-3.455 33.124-13.753 43.078-23.856 12.789-12.762 6.107-16.773 7.826-23.291 2.513-9.416 11.277-12.961 13.143-23.602 0.216-1.508 0.754-2.654 2.113-4.876 2.096-3.202 1.561-9.447 1.582-15.185 0.067-15.027-1.705-30.234-5.159-41.434-3.171-10.483-8.204-17.817-12.515-27.305-8.624-18.906-8.221-27.415-15.933-39.474-8.586-13.613-4.601-22.583-16.011-21.99-14.374 0.826-26.375 21.016-40.104 21.584z"/>
+   <path fill="#757575" d="m159.955 130.419c-9.201 0.346-23.299-25.175-23.931-15.383-0.344 8.295-0.017 8.284-0.156 16.494-0.301 5.764-3.17 6.867-8.812 15.555-3.002 4.774-5.148 9.76-6.714 14.706-0.784 3.41-0.889 6.508-1.764 9.548-0.471 1.699-1.986 3.133-3.003 5.259-3.554 10.688-13.624 24.1-16.009 34.619-2.483 10.82-5.411 17.678-4.954 32.097 0.373 13.528 0.285 10.058 4.651 13.739 4.244 3.632 8.893 7.154 15.699 13.171 7.167 6.233 22.299 17.224 24.294 20.585 2.142 3.432 2.175 11.404 0.896 13.896-1.271 2.428-12.558 3.932-12.486 3.932-0.071 0 9.768 13.453 11.705 15.392 1.867 1.867 9.867 10.744 42.588 4.655 18.545-3.453 33.415-13.682 42.956-23.879 12.187-12.492 5.591-16.771 7.3-23.258 2.507-9.398 11.826-12.959 13.687-23.586 0.215-1.5 0.788-2.643 2.138-4.854 2.104-3.235 1.538-9.462 1.58-15.178 0.133-15.076-1.681-30.228-5.135-41.394-3.173-10.455-8.199-17.779-12.501-27.25-8.609-18.877-8.234-27.399-15.952-39.42-8.389-13.258-4.739-21.911-15.895-21.301-14.21 0.859-26.474 21.295-40.182 21.855z"/>
+   <path fill="#7c7c7c" d="m159.938 131.504c-9.122 0.338-22.854-24.838-23.622-15.586-0.37 7.833-0.131 7.89-0.341 15.741-0.452 5.657-3.388 7.096-8.899 15.628-2.99 4.785-5.021 9.708-6.433 14.535-0.602 3.566-0.218 6.594-1.099 9.57-0.526 1.756-2.475 3.08-3.82 5.477-3.854 10.596-13.703 24.016-16.057 34.361-2.501 10.829-5.453 17.66-4.948 32.052 0.38 13.059 0.177 9.939 4.529 13.66 4.208 3.648 8.948 7.239 15.739 13.242 7.149 6.217 22.358 17.232 24.345 20.581 2.13 3.42 2.216 11.489 0.946 13.968-1.259 2.417-12.538 3.99-12.466 3.99-0.072 0 9.718 13.34 11.653 15.275 1.865 1.864 9.833 10.681 42.498 4.607 18.565-3.453 33.706-13.609 42.834-23.902 11.583-12.223 5.074-16.771 6.774-23.223 2.499-9.382 12.375-12.959 14.229-23.57 0.215-1.496 0.821-2.633 2.162-4.834 2.111-3.271 1.516-9.478 1.578-15.173 0.199-15.125-1.657-30.221-5.109-41.354-3.177-10.427-8.196-17.741-12.488-27.195-8.594-18.848-8.247-27.383-15.972-39.366-8.192-12.903-4.877-21.239-15.779-20.612-14.041 0.894-26.569 21.576-40.254 22.128z"/>
+   <path fill="#848484" d="m159.921 132.589c-9.043 0.331-22.406-24.502-23.312-15.79-0.398 7.373-0.247 7.496-0.527 14.988-0.602 5.551-3.604 7.326-8.984 15.702-2.98 4.796-4.896 9.656-6.154 14.364-0.417 3.723 0.455 6.679-0.432 9.592-0.582 1.813-2.964 3.026-4.639 5.694-4.153 10.504-13.782 23.936-16.104 34.104-2.519 10.838-5.495 17.643-4.941 32.008 0.387 12.586 0.067 9.819 4.407 13.582 4.171 3.664 9.002 7.324 15.777 13.311 7.132 6.201 22.419 17.24 24.396 20.576 2.12 3.41 2.259 11.578 0.998 14.041-1.247 2.408-12.517 4.049-12.446 4.049-0.07 0 9.67 13.227 11.604 15.16 1.861 1.861 9.798 10.615 42.409 4.558 18.584-3.45 33.996-13.538 42.711-23.926 10.979-11.952 4.557-16.769 6.248-23.187 2.491-9.367 12.924-12.959 14.771-23.557 0.215-1.49 0.856-2.622 2.188-4.813 2.118-3.305 1.491-9.494 1.575-15.166 0.267-15.174-1.635-30.215-5.086-41.314-3.179-10.399-8.19-17.703-12.473-27.141-8.579-18.818-8.262-27.366-15.994-39.312-7.993-12.547-5.013-20.565-15.661-19.922-13.876 0.927-26.669 21.855-40.331 22.399z"/>
+   <path fill="#8c8c8c" d="m159.903 133.674c-8.963 0.323-21.961-24.165-23.001-15.994-0.426 6.912-0.363 7.102-0.713 14.236-0.753 5.445-3.821 7.554-9.071 15.775-2.969 4.807-4.768 9.604-5.875 14.192-0.232 3.881 1.128 6.766 0.234 9.615-0.638 1.87-3.452 2.972-5.455 5.911-4.455 10.413-13.862 23.853-16.153 33.845-2.537 10.849-5.537 17.625-4.935 31.963 0.393 12.115-0.042 9.701 4.285 13.505 4.133 3.68 9.057 7.409 15.814 13.38 7.116 6.188 22.48 17.248 24.447 20.574 2.109 3.398 2.301 11.662 1.049 14.113-1.235 2.396-12.496 4.104-12.425 4.104-0.071 0 9.622 13.114 11.552 15.045 1.86 1.858 9.763 10.552 42.319 4.509 18.604-3.449 34.288-13.467 42.589-23.949 10.377-11.682 4.04-16.766 5.721-23.15 2.486-9.35 13.474-12.959 15.316-23.542 0.214-1.483 0.89-2.611 2.213-4.793 2.126-3.339 1.468-9.507 1.573-15.158 0.333-15.224-1.611-30.208-5.062-41.276-3.181-10.37-8.186-17.664-12.459-27.085-8.563-18.789-8.275-27.35-16.014-39.258-7.796-12.192-5.151-19.893-15.545-19.233-13.707 0.961-26.763 22.134-40.404 22.671z"/>
+   <path fill="#939393" d="m159.886 134.759c-8.885 0.316-21.516-23.829-22.691-16.197-0.454 6.451-0.479 6.708-0.899 13.482-0.903 5.339-4.038 7.784-9.157 15.849-2.957 4.818-4.642 9.552-5.595 14.021-0.05 4.037 1.799 6.852 0.9 9.637-0.693 1.928-3.941 2.919-6.273 6.129-4.756 10.32-13.941 23.77-16.201 33.587-2.555 10.858-5.579 17.608-4.928 31.92 0.399 11.644-0.151 9.581 4.162 13.424 4.096 3.697 9.111 7.494 15.854 13.451 7.099 6.17 22.541 17.256 24.498 20.569 2.1 3.387 2.344 11.75 1.101 14.186-1.223 2.387-12.476 4.163-12.404 4.163-0.071 0 9.573 13.001 11.5 14.929 1.857 1.856 9.729 10.488 42.229 4.461 18.625-3.449 34.579-13.396 42.467-23.973 9.774-11.412 3.523-16.764 5.195-23.115 2.479-9.334 14.022-12.959 15.858-23.527 0.214-1.479 0.924-2.601 2.238-4.772 2.134-3.373 1.445-9.522 1.571-15.151 0.399-15.273-1.587-30.201-5.036-41.237-3.185-10.342-8.184-17.625-12.446-27.03-8.548-18.76-8.288-27.333-16.034-39.204-7.598-11.837-5.289-19.221-15.428-18.544-13.543 0.994-26.863 22.413-40.481 22.942z"/>
+   <path fill="#9b9b9b" d="m159.868 135.844c-8.805 0.308-21.068-23.492-22.381-16.401-0.481 5.991-0.594 6.314-1.085 12.73-1.053 5.232-4.253 8.013-9.243 15.922-2.946 4.829-4.515 9.5-5.314 13.85 0.133 4.194 2.471 6.937 1.565 9.658-0.749 1.986-4.43 2.866-7.091 6.347-5.056 10.229-14.021 23.689-16.249 33.329-2.572 10.868-5.621 17.591-4.921 31.876 0.405 11.172-0.261 9.463 4.04 13.346 4.058 3.713 9.166 7.58 15.892 13.521 7.082 6.155 22.601 17.265 24.548 20.567 2.092 3.373 2.388 11.834 1.152 14.256-1.21 2.377-12.454 4.222-12.383 4.222-0.071 0 9.523 12.888 11.45 14.813 1.854 1.854 9.692 10.424 42.138 4.412 18.645-3.447 34.871-13.324 42.345-23.996 9.171-11.143 3.007-16.762 4.669-23.08 2.472-9.317 14.572-12.959 16.401-23.514 0.214-1.473 0.958-2.588 2.265-4.75 2.142-3.408 1.421-9.539 1.568-15.145 0.466-15.324-1.564-30.196-5.012-41.198-3.187-10.313-8.179-17.587-12.433-26.976-8.533-18.73-8.301-27.316-16.054-39.149-7.401-11.482-5.426-18.548-15.313-17.855-13.373 1.029-26.958 22.694-40.554 23.215z"/>
+   <path fill="#a3a3a3" d="m159.851 136.929c-8.727 0.301-20.622-23.156-22.071-16.604-0.509 5.529-0.71 5.919-1.271 11.976-1.203 5.126-4.47 8.243-9.328 15.996-2.936 4.84-4.39 9.448-5.036 13.679 0.316 4.351 3.143 7.023 2.231 9.68-0.804 2.043-4.919 2.812-7.908 6.563-5.356 10.137-14.101 23.607-16.298 33.072-2.589 10.877-5.661 17.574-4.913 31.832 0.412 10.699-0.37 9.342 3.918 13.268 4.021 3.729 9.221 7.664 15.93 13.59 7.064 6.139 22.661 17.271 24.599 20.563 2.081 3.363 2.43 11.922 1.204 14.33-1.198 2.365-12.434 4.278-12.363 4.278-0.07 0 9.477 12.774 11.399 14.697 1.851 1.851 9.659 10.36 42.048 4.364 18.666-3.447 35.162-13.254 42.223-24.021 8.568-10.873 2.49-16.761 4.144-23.045 2.464-9.301 15.121-12.958 16.943-23.498 0.215-1.467 0.992-2.579 2.29-4.729 2.148-3.441 1.398-9.553 1.566-15.139 0.532-15.373-1.541-30.189-4.987-41.158-3.188-10.285-8.174-17.549-12.419-26.921-8.518-18.701-8.313-27.3-16.073-39.096-7.204-11.126-5.564-17.875-15.196-17.165-13.21 1.064-27.058 22.975-40.632 23.488z"/>
+   <path fill="#aaa" d="m159.834 138.014c-8.646 0.293-20.176-22.819-21.761-16.808-0.536 5.069-0.826 5.526-1.457 11.224-1.354 5.02-4.687 8.472-9.416 16.069-2.924 4.851-4.262 9.396-4.756 13.508 0.501 4.507 3.814 7.109 2.897 9.702-0.858 2.1-5.406 2.759-8.725 6.782-5.657 10.045-14.181 23.524-16.347 32.812-2.606 10.888-5.703 17.557-4.906 31.787 0.418 10.229-0.479 9.225 3.795 13.189 3.984 3.745 9.275 7.749 15.968 13.66 7.048 6.124 22.723 17.279 24.651 20.559 2.07 3.352 2.472 12.008 1.255 14.402-1.186 2.355-12.414 4.337-12.343 4.337-0.071 0 9.428 12.66 11.348 14.581 1.85 1.848 9.624 10.297 41.958 4.314 18.687-3.444 35.453-13.18 42.102-24.043 7.965-10.602 1.973-16.758 3.616-23.01 2.457-9.283 15.67-12.957 17.487-23.482 0.214-1.461 1.026-2.568 2.315-4.709 2.155-3.477 1.375-9.568 1.563-15.131 0.6-15.424-1.518-30.184-4.963-41.119-3.192-10.257-8.17-17.511-12.405-26.866-8.502-18.672-8.328-27.284-16.095-39.042-7.005-10.771-5.701-17.203-15.078-16.476-13.04 1.098-27.152 23.255-40.703 23.76z"/>
+   <path fill="#b2b2b2" d="m159.816 139.099c-8.567 0.286-19.729-22.483-21.45-17.012-0.563 4.608-0.942 5.132-1.643 10.471-1.506 4.914-4.904 8.701-9.502 16.143-2.913 4.862-4.137 9.344-4.477 13.336 0.685 4.665 4.486 7.195 3.564 9.725-0.915 2.157-5.897 2.705-9.543 6.999-5.958 9.953-14.262 23.443-16.396 32.554-2.624 10.898-5.745 17.54-4.9 31.744 0.426 9.757-0.588 9.105 3.674 13.111 3.945 3.761 9.33 7.834 16.006 13.729 7.032 6.109 22.783 17.288 24.702 20.557 2.06 3.338 2.515 12.094 1.306 14.473-1.173 2.346-12.392 4.395-12.321 4.395-0.07 0 9.379 12.549 11.296 14.465 1.847 1.848 9.591 10.234 41.868 4.268 18.706-3.444 35.745-13.11 41.979-24.066 7.361-10.332 1.456-16.757 3.091-22.974 2.45-9.269 16.219-12.958 18.03-23.47 0.213-1.455 1.06-2.557 2.34-4.688 2.164-3.509 1.352-9.583 1.562-15.124 0.665-15.473-1.494-30.177-4.938-41.08-3.195-10.228-8.166-17.472-12.393-26.811-8.486-18.642-8.341-27.267-16.114-38.987-6.809-10.416-5.838-16.531-14.962-15.787-12.873 1.129-27.25 23.531-40.779 24.029z"/>
+   <path fill="#bababa" d="m159.799 140.184c-8.487 0.279-19.282-22.146-21.141-17.215-0.591 4.147-1.057 4.737-1.828 9.717-1.656 4.808-5.121 8.931-9.588 16.217-2.902 4.873-4.01 9.292-4.197 13.165 0.868 4.822 5.158 7.281 4.23 9.747-0.971 2.215-6.385 2.651-10.361 7.216-6.258 9.861-14.339 23.36-16.442 32.297-2.643 10.906-5.787 17.521-4.894 31.699 0.432 9.285-0.697 8.986 3.552 13.032 3.908 3.776 9.384 7.919 16.043 13.799 7.016 6.093 22.845 17.296 24.753 20.552 2.051 3.328 2.559 12.18 1.358 14.547-1.161 2.334-12.372 4.451-12.301 4.451-0.071 0 9.33 12.436 11.245 14.35 1.844 1.844 9.555 10.17 41.777 4.219 18.727-3.443 36.036-13.039 41.857-24.09 6.759-10.063 0.939-16.756 2.565-22.939 2.442-9.25 16.768-12.957 18.572-23.453 0.213-1.451 1.095-2.547 2.365-4.668 2.171-3.543 1.329-9.599 1.56-15.117 0.732-15.522-1.471-30.172-4.913-41.042-3.197-10.2-8.161-17.433-12.379-26.756-8.471-18.612-8.354-27.25-16.135-38.933-6.609-10.061-5.976-15.858-14.845-15.098-12.706 1.165-27.347 23.813-40.853 24.303z"/>
+   <path fill="#c1c1c1" d="m159.781 141.269c-8.408 0.271-18.837-21.81-20.83-17.419-0.619 3.687-1.173 4.344-2.014 8.965-1.808 4.701-5.338 9.16-9.674 16.29-2.892 4.884-3.885 9.24-3.918 12.994 1.052 4.978 5.829 7.367 4.896 9.769-1.026 2.272-6.874 2.598-11.178 7.434-6.56 9.769-14.419 23.277-16.491 32.039-2.66 10.916-5.829 17.504-4.887 31.656 0.438 8.813-0.807 8.867 3.43 12.953 3.87 3.793 9.438 8.004 16.082 13.868 6.997 6.077 22.904 17.304 24.803 20.55 2.041 3.314 2.601 12.266 1.409 14.617-1.149 2.324-12.351 4.51-12.28 4.51-0.07 0 9.282 12.321 11.194 14.233 1.841 1.842 9.521 10.106 41.688 4.17 18.746-3.44 36.326-12.967 41.734-24.112 6.156-9.793 0.423-16.754 2.038-22.904 2.438-9.235 17.318-12.957 19.117-23.438 0.212-1.444 1.128-2.536 2.39-4.647 2.18-3.578 1.306-9.613 1.558-15.11 0.799-15.571-1.447-30.165-4.889-41.002-3.2-10.172-8.156-17.395-12.364-26.701-8.456-18.583-8.367-27.234-16.155-38.88-6.413-9.705-6.114-15.185-14.729-14.408-12.541 1.197-27.445 24.091-40.93 24.573z"/>
+   <path fill="#c9c9c9" d="m159.764 142.354c-8.329 0.264-18.392-21.473-20.521-17.622-0.646 3.225-1.289 3.949-2.2 8.211-1.957 4.596-5.555 9.39-9.761 16.364-2.879 4.895-3.757 9.188-3.638 12.823 1.235 5.135 6.502 7.453 5.562 9.791-1.081 2.329-7.362 2.544-11.995 7.651-6.859 9.677-14.499 23.195-16.54 31.78-2.677 10.927-5.87 17.488-4.879 31.611 0.444 8.344-0.916 8.748 3.307 12.875 3.834 3.81 9.492 8.09 16.121 13.939 6.98 6.061 22.965 17.311 24.854 20.545 2.031 3.303 2.643 12.352 1.461 14.69-1.137 2.313-12.33 4.567-12.26 4.567-0.07 0 9.233 12.209 11.143 14.117 1.839 1.84 9.486 10.043 41.599 4.122 18.767-3.44 36.618-12.896 41.612-24.137 5.554-9.522-0.094-16.751 1.513-22.868 2.43-9.219 17.866-12.957 19.659-23.424 0.213-1.439 1.162-2.525 2.415-4.627 2.188-3.612 1.282-9.629 1.556-15.104 0.865-15.621-1.424-30.158-4.864-40.962-3.202-10.144-8.153-17.357-12.351-26.646-8.441-18.554-8.381-27.218-16.176-38.826-6.216-9.35-6.251-14.513-14.612-13.719-12.374 1.235-27.543 24.375-41.005 24.849z"/>
+   <path fill="#d1d1d1" d="m159.747 143.439c-8.25 0.256-17.944-21.137-20.21-17.826-0.675 2.765-1.406 3.555-2.386 7.459-2.108 4.489-5.772 9.619-9.847 16.437-2.869 4.906-3.631 9.136-3.358 12.652 1.419 5.292 7.174 7.538 6.228 9.812-1.137 2.387-7.852 2.491-12.813 7.869-7.161 9.586-14.579 23.114-16.588 31.522-2.695 10.938-5.912 17.471-4.873 31.568 0.451 7.871-1.025 8.629 3.185 12.797 3.796 3.824 9.547 8.174 16.158 14.008 6.964 6.047 23.026 17.32 24.905 20.541 2.021 3.292 2.686 12.439 1.513 14.764-1.125 2.303-12.31 4.625-12.239 4.625-0.07 0 9.186 12.094 11.092 14.002 1.836 1.836 9.45 9.978 41.509 4.072 18.786-3.439 36.909-12.824 41.49-24.16 4.948-9.252-0.611-16.748 0.985-22.832 2.423-9.203 18.415-12.957 20.203-23.41 0.212-1.434 1.196-2.514 2.44-4.605 2.193-3.646 1.259-9.645 1.553-15.098 0.932-15.67-1.4-30.151-4.84-40.922-3.205-10.115-8.148-17.319-12.336-26.592-8.427-18.524-8.396-27.201-16.197-38.771-6.017-8.995-6.388-13.84-14.495-13.03-12.207 1.266-27.64 24.652-41.079 25.118z"/>
+   <path fill="#d8d8d8" d="m159.729 144.524c-8.17 0.249-17.498-20.8-19.9-18.03-0.702 2.304-1.521 3.162-2.571 6.706-2.259 4.383-5.988 9.848-9.933 16.511-2.858 4.917-3.504 9.084-3.079 12.48 1.604 5.449 7.846 7.625 6.895 9.835-1.193 2.444-8.342 2.438-13.631 8.087-7.461 9.493-14.658 23.031-16.637 31.262-2.712 10.947-5.953 17.455-4.865 31.524 0.458 7.399-1.135 8.511 3.063 12.718 3.758 3.842 9.601 8.26 16.196 14.078 6.946 6.031 23.087 17.328 24.956 20.538 2.011 3.28 2.729 12.524 1.563 14.835-1.112 2.293-12.289 4.684-12.218 4.684-0.071 0 9.136 11.981 11.04 13.886 1.834 1.834 9.417 9.913 41.419 4.024 18.807-3.438 37.2-12.752 41.368-24.184 4.346-8.982-1.128-16.747 0.46-22.798 2.416-9.187 18.964-12.956 20.746-23.394 0.211-1.429 1.229-2.504 2.465-4.586 2.202-3.681 1.236-9.658 1.551-15.091 0.998-15.72-1.377-30.146-4.814-40.884-3.208-10.086-8.145-17.28-12.323-26.536-8.411-18.495-8.408-27.185-16.217-38.717-5.82-8.64-6.526-13.168-14.38-12.341-12.04 1.303-27.736 24.934-41.154 25.393z"/>
+   <path fill="#e0e0e0" d="m159.712 145.609c-8.091 0.241-17.052-20.464-19.59-18.233-0.729 1.843-1.637 2.767-2.757 5.953-2.409 4.276-6.206 10.077-10.02 16.584-2.847 4.928-3.378 9.032-2.8 12.309 1.787 5.606 8.519 7.711 7.561 9.857-1.248 2.502-8.829 2.384-14.448 8.304-7.761 9.402-14.738 22.95-16.684 31.006-2.731 10.955-5.996 17.436-4.859 31.48 0.464 6.928-1.244 8.389 2.939 12.639 3.722 3.857 9.656 8.344 16.234 14.148 6.932 6.014 23.148 17.336 25.008 20.533 2 3.268 2.771 12.611 1.615 14.907-1.1 2.282-12.268 4.741-12.198 4.741-0.069 0 9.089 11.867 10.989 13.77 1.831 1.831 9.382 9.85 41.329 3.977 18.827-3.438 37.492-12.683 41.246-24.207 3.743-8.715-1.646-16.746-0.066-22.762 2.409-9.171 19.514-12.957 21.289-23.381 0.211-1.422 1.265-2.494 2.49-4.564 2.21-3.715 1.213-9.674 1.549-15.084 1.065-15.77-1.354-30.139-4.791-40.844-3.21-10.058-8.14-17.241-12.309-26.481-8.396-18.466-8.421-27.168-16.237-38.664-5.622-8.284-6.663-12.495-14.262-11.651-11.872 1.335-27.833 25.212-41.228 25.663z"/>
+   <path fill="#e8e8e8" d="m159.694 146.694c-8.012 0.234-16.605-20.127-19.279-18.437-0.757 1.383-1.753 2.373-2.943 5.2-2.56 4.171-6.423 10.307-10.105 16.658-2.835 4.939-3.251 8.979-2.52 12.138 1.97 5.763 9.189 7.796 8.226 9.879-1.303 2.559-9.318 2.33-15.265 8.521-8.063 9.31-14.818 22.867-16.733 30.748-2.748 10.967-6.037 17.419-4.853 31.436 0.472 6.457-1.353 8.271 2.818 12.562 3.685 3.873 9.711 8.429 16.273 14.218 6.913 6 23.207 17.344 25.058 20.529 1.991 3.257 2.814 12.697 1.666 14.98-1.087 2.271-12.247 4.799-12.177 4.799-0.07 0 9.04 11.755 10.938 13.654 1.829 1.828 9.349 9.785 41.239 3.926 18.847-3.435 37.783-12.609 41.124-24.229 3.14-8.444-2.161-16.743-0.592-22.728 2.401-9.152 20.062-12.955 21.831-23.364 0.211-1.417 1.298-2.483 2.516-4.544 2.217-3.748 1.19-9.689 1.547-15.076 1.132-15.82-1.331-30.133-4.766-40.806-3.213-10.03-8.136-17.203-12.296-26.427-8.38-18.436-8.435-27.151-16.257-38.609-5.425-7.929-6.802-11.822-14.146-10.962-11.706 1.368-27.931 25.491-41.304 25.934z"/>
+   <path fill="#efefef" d="m159.677 147.779c-7.934 0.226-16.16-19.791-18.97-18.64-0.785 0.921-1.869 1.979-3.13 4.447-2.71 4.064-6.639 10.536-10.19 16.731-2.824 4.95-3.125 8.928-2.24 11.967 2.152 5.919 9.86 7.882 8.892 9.901-1.358 2.616-9.808 2.277-16.083 8.739-8.363 9.218-14.896 22.784-16.781 30.489-2.766 10.977-6.079 17.402-4.846 31.393 0.478 5.984-1.462 8.152 2.696 12.482 3.646 3.889 9.765 8.514 16.311 14.287 6.896 5.983 23.269 17.352 25.109 20.526 1.98 3.245 2.855 12.782 1.718 15.052-1.076 2.262-12.227 4.857-12.156 4.857-0.07 0 8.991 11.641 10.887 13.537 1.826 1.826 9.313 9.723 41.148 3.879 18.868-3.434 38.074-12.538 41.002-24.254 2.537-8.174-2.678-16.741-1.119-22.69 2.396-9.138 20.612-12.957 22.375-23.351 0.212-1.412 1.332-2.473 2.541-4.523 2.226-3.783 1.166-9.704 1.545-15.07 1.197-15.869-1.307-30.125-4.741-40.766-3.215-10.002-8.131-17.165-12.282-26.372-8.365-18.407-8.447-27.135-16.277-38.555-5.228-7.574-6.938-11.15-14.029-10.272-11.541 1.402-28.029 25.771-41.38 26.206z"/>
+   <path fill="#f7f7f7" d="m159.66 148.864c-7.854 0.219-15.714-19.454-18.66-18.844-0.812 0.461-1.983 1.585-3.314 3.694-2.86 3.958-6.856 10.766-10.278 16.805-2.813 4.961-2.998 8.876-1.96 11.796 2.337 6.076 10.533 7.968 9.558 9.923-1.415 2.673-10.296 2.223-16.899 8.956-8.664 9.126-14.978 22.702-16.83 30.23-2.783 10.986-6.121 17.386-4.839 31.349 0.484 5.515-1.571 8.033 2.573 12.403 3.609 3.906 9.82 8.6 16.35 14.357 6.88 5.969 23.329 17.36 25.16 20.523 1.971 3.232 2.898 12.869 1.77 15.124-1.063 2.252-12.206 4.915-12.136 4.915-0.07 0 8.942 11.527 10.835 13.422 1.824 1.822 9.279 9.658 41.059 3.83 18.889-3.434 38.366-12.467 40.881-24.278 1.934-7.903-3.195-16.739-1.646-22.655 2.388-9.121 21.161-12.955 22.918-23.336 0.211-1.404 1.366-2.461 2.566-4.502 2.232-3.816 1.143-9.719 1.542-15.063 1.265-15.92-1.283-30.12-4.717-40.727-3.219-9.974-8.128-17.127-12.269-26.317-8.349-18.378-8.461-27.119-16.298-38.501-5.029-7.219-7.075-10.478-13.912-9.584-11.373 1.438-28.126 26.053-41.454 26.48z"/>
+   <path fill="#fff" d="m159.642 149.949c-7.774 0.211-15.268-19.118-18.35-19.048-0.84 0-2.1 1.191-3.501 2.941-3.011 3.852-7.072 10.995-10.363 16.878-2.803 4.972-2.872 8.824-1.682 11.625 2.521 6.233 11.205 8.054 10.225 9.945-1.471 2.731-10.785 2.17-17.719 9.174-8.964 9.034-15.056 22.621-16.877 29.973-2.801 10.995-6.163 17.368-4.832 31.304 0.49 5.043-1.681 7.914 2.451 12.325 3.571 3.923 9.874 8.685 16.387 14.427 6.863 5.953 23.391 17.368 25.211 20.521 1.962 3.221 2.942 12.954 1.821 15.196-1.051 2.24-12.185 4.972-12.115 4.972-0.069 0 8.895 11.416 10.784 13.307 1.821 1.82 9.244 9.595 40.97 3.781 18.907-3.431 38.656-12.396 40.758-24.302 1.331-7.633-3.712-16.736-2.171-22.619 2.381-9.104 21.71-12.956 23.461-23.321 0.21-1.399 1.399-2.45 2.591-4.481 2.24-3.852 1.12-9.734 1.54-15.057 1.331-15.968-1.26-30.113-4.692-40.688-3.221-9.945-8.123-17.088-12.255-26.262-8.334-18.348-8.474-27.102-16.318-38.447-4.832-6.863-7.213-9.805-13.796-8.894-11.205 1.469-28.222 26.33-41.528 26.75z"/>
+  </g>
+  <path fill="#995900" d="m152.553 88.8575c5.256-0.648 12.456 0.648 15.769 3.096 3.096 2.304 5.256 3.528 8.063 4.464 9.433 3.096 21.816 4.536 21.24 13.032-0.648 10.151-3.6 14.688-12.024 17.351-6.768 2.088-18.863 13.824-28.224 13.824-4.176 0-10.008 0.216-13.392-1.008-3.24-1.152-7.776-6.624-13.104-11.016-5.328-4.32-10.296-8.928-10.439-14.976-0.217-6.407 3.96-8.496 9.863-13.607 3.097-2.736 8.712-7.272 12.601-9.288 3.599-1.799 5.903-1.439 9.647-1.872z"/>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#9e5f00" d="m165.068 78.951c5.225-0.644 12.384 0.645 15.677 3.079 3.078 2.29 5.227 3.51 8.018 4.438 9.375 3.078 21.729 4.529 21.159 12.973-0.641 10.09-3.669 14.581-12.041 17.223-6.723 2.073-18.768 13.589-28.07 13.64-4.21 0.032-9.926 0.234-13.287-0.977-3.215-1.142-7.737-6.608-13.031-10.969-5.291-4.292-10.26-8.774-10.317-14.765-0.153-6.252 3.912-8.411 9.773-13.488 3.071-2.71 8.594-7.303 12.463-9.333 3.563-1.803 5.933-1.392 9.656-1.821z"/>
+   <path fill="#a36400" d="m165.177 79.044c5.195-0.641 12.313 0.64 15.587 3.06 3.06 2.278 5.194 3.494 7.971 4.413 9.317 3.06 21.641 4.522 21.078 12.914-0.634 10.027-3.737 14.474-12.058 17.094-6.678 2.057-18.673 13.352-27.919 13.454-4.241 0.064-9.842 0.252-13.18-0.945-3.19-1.133-7.7-6.592-12.96-10.921-5.254-4.264-10.222-8.622-10.192-14.555-0.093-6.099 3.863-8.329 9.681-13.369 3.048-2.685 8.478-7.335 12.328-9.379 3.526-1.804 5.963-1.338 9.664-1.766z"/>
+   <path fill="#a86a00" d="m165.287 79.138c5.165-0.637 12.241 0.637 15.496 3.043 3.042 2.264 5.165 3.476 7.924 4.387 9.26 3.042 21.556 4.515 20.998 12.854-0.627 9.968-3.805 14.368-12.074 16.967-6.633 2.042-18.576 13.117-27.766 13.27-4.276 0.096-9.759 0.27-13.075-0.914-3.165-1.123-7.661-6.577-12.887-10.874-5.217-4.236-10.187-8.468-10.069-14.345-0.03-5.943 3.815-8.244 9.589-13.249 3.023-2.66 8.36-7.366 12.191-9.424 3.49-1.808 5.993-1.291 9.673-1.715z"/>
+   <path fill="#ad7000" d="m165.396 79.23c5.135-0.633 12.17 0.633 15.404 3.025 3.025 2.251 5.137 3.46 7.88 4.361 9.201 3.025 21.467 4.508 20.917 12.796-0.62 9.905-3.874 14.26-12.093 16.837-6.586 2.027-18.479 12.882-27.611 13.086-4.311 0.127-9.677 0.287-12.971-0.883-3.14-1.113-7.622-6.561-12.814-10.826-5.18-4.208-10.148-8.315-9.945-14.135 0.031-5.789 3.768-8.16 9.497-13.129 2.999-2.635 8.244-7.398 12.055-9.47 3.454-1.808 6.023-1.24 9.681-1.662z"/>
+   <path fill="#b27600" d="m165.506 79.325c5.105-0.63 12.099 0.629 15.314 3.007 3.007 2.237 5.104 3.442 7.832 4.335 9.145 3.007 21.38 4.501 20.837 12.737-0.614 9.844-3.943 14.154-12.109 16.709-6.541 2.011-18.385 12.645-27.46 12.9-4.342 0.16-9.592 0.306-12.862-0.851-3.115-1.103-7.584-6.545-12.743-10.779-5.144-4.18-10.112-8.162-9.821-13.924 0.092-5.634 3.718-8.076 9.405-13.009 2.975-2.609 8.126-7.429 11.919-9.514 3.416-1.812 6.052-1.192 9.688-1.611z"/>
+   <path fill="#b77b00" d="m165.615 79.417c5.075-0.626 12.026 0.626 15.224 2.989 2.989 2.225 5.075 3.425 7.786 4.31 9.087 2.989 21.292 4.494 20.756 12.678-0.606 9.781-4.012 14.046-12.126 16.581-6.496 1.997-18.289 12.41-27.307 12.716-4.376 0.191-9.51 0.323-12.758-0.82-3.09-1.094-7.546-6.53-12.671-10.732-5.106-4.152-10.074-8.008-9.697-13.713 0.155-5.479 3.67-7.992 9.313-12.889 2.951-2.585 8.011-7.461 11.783-9.56 3.38-1.814 6.083-1.143 9.697-1.56z"/>
+   <path fill="#bc8100" d="m165.725 79.511c5.044-0.622 11.954 0.622 15.133 2.972 2.971 2.211 5.045 3.408 7.739 4.284 9.029 2.971 21.205 4.487 20.675 12.619-0.6 9.719-4.079 13.939-12.143 16.451-6.45 1.982-18.192 12.175-27.153 12.532-4.41 0.223-9.428 0.341-12.653-0.789-3.065-1.084-7.507-6.514-12.598-10.684-5.069-4.124-10.038-7.855-9.574-13.504 0.217-5.324 3.622-7.908 9.222-12.77 2.926-2.559 7.894-7.492 11.646-9.605 3.344-1.816 6.113-1.092 9.706-1.506z"/>
+   <path fill="#c18700" d="m165.834 79.604c5.015-0.618 11.883 0.619 15.043 2.954 2.953 2.198 5.015 3.391 7.693 4.259 8.972 2.953 21.118 4.48 20.594 12.559-0.593 9.66-4.147 13.833-12.159 16.324-6.405 1.967-18.098 11.94-27.002 12.347-4.441 0.255-9.343 0.359-12.546-0.757-3.04-1.074-7.469-6.498-12.526-10.637-5.032-4.096-10-7.701-9.45-13.293 0.278-5.169 3.574-7.823 9.13-12.649 2.903-2.534 7.776-7.524 11.511-9.651 3.306-1.821 6.141-1.044 9.712-1.456z"/>
+   <path fill="#c68d00" d="m165.944 79.697c4.984-0.615 11.811 0.614 14.952 2.936 2.935 2.184 4.983 3.374 7.646 4.233 8.915 2.935 21.031 4.473 20.515 12.5-0.586 9.597-4.218 13.726-12.177 16.195-6.36 1.951-18.002 11.703-26.849 12.162-4.476 0.287-9.261 0.377-12.441-0.726-3.015-1.064-7.431-6.482-12.453-10.589-4.995-4.068-9.965-7.549-9.326-13.083 0.34-5.015 3.524-7.741 9.038-12.531 2.878-2.508 7.658-7.555 11.374-9.696 3.269-1.82 6.171-0.992 9.721-1.401z"/>
+   <path fill="#cc9200" d="m166.054 79.791c4.952-0.61 11.738 0.611 14.86 2.918 2.918 2.172 4.954 3.357 7.601 4.207 8.857 2.918 20.942 4.466 20.432 12.442-0.578 9.536-4.285 13.62-12.192 16.066-6.314 1.936-17.906 11.468-26.696 11.978-4.509 0.319-9.178 0.394-12.335-0.696-2.989-1.054-7.393-6.466-12.382-10.541-4.959-4.04-9.928-7.395-9.202-12.873 0.401-4.859 3.477-7.655 8.945-12.411 2.854-2.482 7.542-7.586 11.239-9.741 3.233-1.824 6.201-0.943 9.73-1.349z"/>
+   <path fill="#d19800" d="m166.163 79.883c4.923-0.606 11.668 0.608 14.771 2.901 2.9 2.158 4.924 3.339 7.554 4.181 8.801 2.9 20.855 4.459 20.352 12.383-0.571 9.474-4.353 13.512-12.21 15.938-6.269 1.921-17.81 11.233-26.543 11.793-4.542 0.351-9.094 0.413-12.229-0.664-2.965-1.044-7.354-6.45-12.311-10.494-4.921-4.012-9.89-7.241-9.079-12.662 0.465-4.705 3.431-7.571 8.855-12.29 2.83-2.458 7.425-7.618 11.102-9.787 3.197-1.827 6.231-0.893 9.738-1.299z"/>
+   <path fill="#d69e00" d="m166.273 79.978c4.893-0.603 11.596 0.603 14.679 2.882 2.883 2.145 4.895 3.323 7.507 4.156 8.744 2.882 20.77 4.452 20.272 12.324-0.565 9.412-4.422 13.406-12.228 15.81-6.224 1.905-17.714 10.996-26.39 11.608-4.576 0.383-9.012 0.431-12.124-0.633-2.94-1.034-7.316-6.434-12.237-10.446-4.884-3.984-9.854-7.089-8.955-12.452 0.525-4.551 3.382-7.489 8.764-12.171 2.805-2.432 7.307-7.649 10.965-9.832 3.16-1.829 6.261-0.845 9.747-1.246z"/>
+   <path fill="#dba300" d="m166.382 80.07c4.863-0.599 11.525 0.6 14.59 2.865 2.864 2.131 4.862 3.305 7.461 4.13 8.686 2.864 20.682 4.445 20.19 12.264-0.559 9.352-4.491 13.299-12.244 15.681-6.179 1.89-17.619 10.761-26.237 11.423-4.608 0.415-8.929 0.449-12.018-0.601-2.915-1.024-7.277-6.418-12.166-10.399-4.847-3.956-9.815-6.935-8.831-12.241 0.587-4.396 3.333-7.404 8.671-12.051 2.782-2.407 7.191-7.681 10.83-9.878 3.123-1.829 6.29-0.793 9.754-1.193z"/>
+   <path fill="#e0a900" d="m166.492 80.164c4.832-0.595 11.453 0.596 14.498 2.847 2.847 2.118 4.833 3.289 7.414 4.104 8.629 2.846 20.595 4.438 20.111 12.205-0.553 9.29-4.56 13.193-12.262 15.553-6.134 1.875-17.522 10.526-26.085 11.239-4.642 0.447-8.845 0.467-11.912-0.57-2.89-1.015-7.238-6.402-12.093-10.351-4.81-3.928-9.78-6.782-8.708-12.032 0.649-4.241 3.285-7.32 8.58-11.932 2.757-2.381 7.073-7.712 10.693-9.923 3.088-1.831 6.321-0.743 9.764-1.14z"/>
+   <path fill="#e5af00" d="m166.601 80.257c4.803-0.592 11.382 0.592 14.407 2.829 2.829 2.105 4.804 3.271 7.368 4.079 8.571 2.828 20.507 4.431 20.029 12.146-0.544 9.228-4.627 13.085-12.277 15.423-6.089 1.861-17.427 10.29-25.932 11.055-4.676 0.478-8.763 0.484-11.807-0.539-2.865-1.005-7.2-6.387-12.021-10.304-4.772-3.9-9.742-6.629-8.583-11.821 0.711-4.085 3.236-7.236 8.487-11.812 2.732-2.357 6.957-7.744 10.557-9.968 3.052-1.834 6.351-0.694 9.772-1.088z"/>
+   <path fill="#eab500" d="m166.711 80.351c4.772-0.588 11.31 0.589 14.317 2.811 2.811 2.092 4.771 3.254 7.321 4.054 8.514 2.81 20.42 4.424 19.948 12.087-0.538 9.165-4.695 12.979-12.294 15.295-6.044 1.845-17.332 10.054-25.779 10.869-4.708 0.511-8.68 0.503-11.7-0.507-2.84-0.995-7.163-6.371-11.949-10.257-4.736-3.872-9.706-6.475-8.46-11.61 0.773-3.931 3.188-7.152 8.396-11.692 2.709-2.331 6.839-7.775 10.421-10.013 3.013-1.839 6.38-0.645 9.779-1.037z"/>
+   <path fill="#efba00" d="m166.82 80.443c4.742-0.584 11.238 0.585 14.226 2.794 2.794 2.078 4.743 3.237 7.276 4.027 8.456 2.793 20.332 4.417 19.868 12.029-0.531 9.104-4.766 12.872-12.313 15.167-5.997 1.83-17.234 9.819-25.626 10.685-4.742 0.542-8.596 0.52-11.595-0.476-2.815-0.985-7.124-6.355-11.877-10.209-4.699-3.844-9.668-6.322-8.336-11.4 0.835-3.778 3.14-7.068 8.304-11.573 2.686-2.306 6.724-7.807 10.285-10.059 2.978-1.84 6.411-0.595 9.788-0.985z"/>
+   <path fill="#f4c000" d="m166.93 80.537c4.711-0.58 11.166 0.582 14.135 2.776 2.775 2.066 4.713 3.22 7.229 4.002 8.399 2.775 20.246 4.41 19.787 11.969-0.522 9.043-4.832 12.765-12.328 15.039-5.952 1.815-17.139 9.584-25.473 10.501-4.776 0.574-8.513 0.538-11.49-0.445-2.79-0.976-7.085-6.34-11.804-10.162-4.662-3.816-9.632-6.168-8.213-11.189 0.896-3.623 3.092-6.984 8.213-11.454 2.66-2.281 6.604-7.838 10.147-10.104 2.942-1.844 6.441-0.547 9.797-0.933z"/>
+   <path fill="#f9c600" d="m167.039 80.63c4.683-0.577 11.095 0.577 14.045 2.758 2.758 2.052 4.683 3.203 7.184 3.976 8.341 2.757 20.157 4.403 19.706 11.91-0.518 8.981-4.901 12.659-12.346 14.911-5.906 1.799-17.044 9.347-25.32 10.315-4.809 0.606-8.431 0.556-11.384-0.413-2.765-0.966-7.048-6.324-11.732-10.114-4.625-3.788-9.594-6.016-8.088-10.98 0.958-3.467 3.043-6.9 8.12-11.333 2.637-2.256 6.488-7.87 10.013-10.15 2.902-1.844 6.468-0.495 9.802-0.88z"/>
+  </g>
+  <path fill="#fc0" d="m154.744 90.7245c4.65-0.573 11.022 0.574 13.954 2.74 2.739 2.039 4.651 3.186 7.136 3.951 8.284 2.739 20.071 4.396 19.626 11.851-0.51 8.919-4.97 12.551-12.362 14.781-5.861 1.784-16.947 9.112-25.168 10.131-4.842 0.638-8.347 0.574-11.277-0.382-2.74-0.956-7.01-6.308-11.66-10.067-4.588-3.76-9.559-5.862-7.965-10.769 1.02-3.313 2.995-6.816 8.028-11.213 2.612-2.23 6.371-7.901 9.876-10.195 2.867-1.847 6.499-0.447 9.812-0.828z"/>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#fc0" d="m167.982 83.609c1.008 2.088 3.6 2.376 5.328 3.312 1.655 0.936 2.592 1.152 3.239 0.792 1.44-0.792 0.36-3.384-1.079-4.32-1.368-0.935-8.064-1.151-7.488 0.216z"/>
+   <path fill="#f9c600" d="m168.125 83.631c0.982 2.035 3.508 2.316 5.193 3.229 1.614 0.912 2.526 1.123 3.158 0.771 1.402-0.771 0.35-3.298-1.054-4.21-1.332-0.913-7.859-1.123-7.297 0.21z"/>
+   <path fill="#f4c000" d="m168.267 83.653c0.957 1.982 3.418 2.255 5.058 3.144 1.572 0.889 2.461 1.094 3.076 0.752 1.367-0.752 0.342-3.213-1.025-4.101-1.299-0.889-7.656-1.094-7.109 0.205z"/>
+   <path fill="#efba00" d="m168.409 83.674c0.932 1.929 3.327 2.195 4.924 3.06 1.53 0.865 2.395 1.064 2.993 0.732 1.331-0.732 0.333-3.127-0.998-3.992-1.264-0.864-7.451-1.064-6.919 0.2z"/>
+   <path fill="#eab500" d="m168.552 83.696c0.905 1.876 3.234 2.135 4.787 2.977 1.488 0.841 2.329 1.035 2.912 0.711 1.294-0.711 0.323-3.041-0.971-3.882-1.228-0.841-7.246-1.036-6.728 0.194z"/>
+   <path fill="#e5af00" d="m168.694 83.718c0.881 1.823 3.144 2.075 4.653 2.892 1.446 0.818 2.264 1.006 2.83 0.692 1.257-0.692 0.313-2.956-0.943-3.773-1.195-0.818-7.043-1.007-6.54 0.189z"/>
+   <path fill="#e0a900" d="m168.837 83.739c0.855 1.771 3.053 2.015 4.519 2.809 1.403 0.793 2.198 0.977 2.747 0.671 1.221-0.671 0.306-2.87-0.916-3.664-1.161-0.793-6.839-0.976-6.35 0.184z"/>
+   <path fill="#dba300" d="m168.979 83.761c0.829 1.718 2.962 1.955 4.383 2.725 1.363 0.77 2.132 0.948 2.666 0.651 1.184-0.651 0.296-2.784-0.889-3.554-1.125-0.77-6.634-0.948-6.16 0.178z"/>
+   <path fill="#d69e00" d="m169.121 83.782c0.804 1.665 2.871 1.895 4.249 2.641 1.32 0.747 2.066 0.918 2.583 0.631 1.148-0.631 0.287-2.698-0.861-3.444-1.091-0.746-6.43-0.919-5.971 0.172z"/>
+   <path fill="#d19800" d="m169.264 83.804c0.777 1.612 2.778 1.834 4.112 2.557 1.279 0.723 2.001 0.889 2.501 0.611 1.112-0.611 0.278-2.612-0.834-3.335-1.055-0.722-6.224-0.889-5.779 0.167z"/>
+   <path fill="#cc9200" d="m169.406 83.826c0.753 1.559 2.688 1.774 3.979 2.473 1.236 0.699 1.936 0.86 2.42 0.591 1.074-0.591 0.269-2.527-0.808-3.226-1.021-0.699-6.021-0.86-5.591 0.162z"/>
+   <path fill="#c68c00" d="m169.549 83.847c0.728 1.506 2.597 1.714 3.844 2.389 1.194 0.675 1.869 0.831 2.337 0.571 1.039-0.571 0.26-2.441-0.779-3.116-0.988-0.675-5.818-0.831-5.402 0.156z"/>
+   <path fill="#c18700" d="m169.691 83.869c0.702 1.453 2.506 1.654 3.709 2.305 1.152 0.652 1.803 0.802 2.254 0.551 1.002-0.551 0.251-2.355-0.751-3.006-0.953-0.652-5.613-0.802-5.212 0.15z"/>
+   <path fill="#bc8100" d="m169.833 83.89c0.677 1.4 2.415 1.594 3.574 2.221 1.111 0.628 1.738 0.772 2.173 0.531 0.965-0.531 0.241-2.27-0.725-2.897-0.917-0.627-5.408-0.772-5.022 0.145z"/>
+   <path fill="#b77b00" d="m169.976 83.912c0.65 1.347 2.322 1.533 3.438 2.137 1.069 0.604 1.673 0.743 2.091 0.511 0.93-0.511 0.233-2.184-0.696-2.788-0.884-0.603-5.205-0.743-4.833 0.14z"/>
+   <path fill="#b27500" d="m170.118 83.934c0.626 1.294 2.232 1.473 3.304 2.053 1.027 0.581 1.606 0.714 2.009 0.491 0.893-0.491 0.224-2.098-0.669-2.678-0.85-0.58-5.001-0.715-4.644 0.134z"/>
+   <path fill="#ad7000" d="m170.261 83.955c0.6 1.242 2.14 1.413 3.168 1.97 0.984 0.557 1.541 0.685 1.927 0.47 0.855-0.47 0.214-2.012-0.644-2.569-0.812-0.555-4.794-0.684-4.451 0.129z"/>
+   <path fill="#a86a00" d="m170.403 83.977c0.574 1.189 2.05 1.353 3.034 1.886 0.942 0.533 1.475 0.656 1.844 0.45 0.82-0.45 0.205-1.926-0.615-2.459-0.779-0.533-4.591-0.656-4.263 0.123z"/>
+   <path fill="#a36400" d="m170.545 83.998c0.55 1.136 1.959 1.292 2.899 1.802 0.901 0.509 1.41 0.626 1.762 0.43 0.783-0.43 0.197-1.841-0.587-2.35-0.745-0.508-4.387-0.626-4.074 0.118z"/>
+   <path fill="#9e5e00" d="m170.688 84.02c0.522 1.083 1.867 1.232 2.764 1.718 0.859 0.486 1.343 0.597 1.68 0.41 0.746-0.41 0.188-1.755-0.561-2.241-0.709-0.484-4.182-0.597-3.883 0.113z"/>
+   <path fill="#995900" d="m170.83 84.042c0.498 1.03 1.776 1.172 2.629 1.634 0.817 0.462 1.278 0.568 1.599 0.39 0.71-0.39 0.178-1.669-0.533-2.131-0.676-0.461-3.979-0.568-3.695 0.107z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#fc0" d="m152.875 86.29c-0.325 0.813 1.952 2.359 3.091 1.301 1.222-1.057 2.686-2.033 3.175-2.359 2.195-1.465 1.383-2.522-2.278-1.871-3.663 0.651-3.663 2.115-3.988 2.929z"/>
+   <path fill="#f9c600" d="m152.934 86.279c-0.318 0.794 1.906 2.304 3.019 1.271 1.193-1.033 2.623-1.986 3.102-2.305 2.145-1.431 1.351-2.463-2.226-1.828-3.578 0.637-3.578 2.067-3.895 2.862z"/>
+   <path fill="#f4c000" d="m152.993 86.269c-0.31 0.775 1.861 2.25 2.948 1.241 1.164-1.008 2.56-1.939 3.026-2.25 2.095-1.397 1.319-2.405-2.173-1.784-3.491 0.62-3.491 2.017-3.801 2.793z"/>
+   <path fill="#efba00" d="m153.051 86.258c-0.302 0.757 1.817 2.195 2.878 1.211 1.136-0.984 2.497-1.892 2.952-2.195 2.044-1.363 1.287-2.347-2.118-1.741-3.409 0.606-3.409 1.968-3.712 2.725z"/>
+   <path fill="#eab500" d="m153.11 86.248c-0.295 0.738 1.771 2.141 2.805 1.181 1.108-0.959 2.437-1.845 2.88-2.141 1.993-1.329 1.255-2.289-2.066-1.698-3.324 0.591-3.324 1.92-3.619 2.658z"/>
+   <path fill="#e5af00" d="m153.169 86.238c-0.287 0.719 1.727 2.086 2.733 1.151 1.08-0.935 2.374-1.798 2.807-2.086 1.942-1.296 1.224-2.23-2.015-1.655s-3.238 1.87-3.525 2.59z"/>
+   <path fill="#e0a900" d="m153.228 86.228c-0.28 0.7 1.681 2.032 2.661 1.121 1.052-0.91 2.312-1.751 2.732-2.031 1.893-1.262 1.191-2.172-1.961-1.611-3.152 0.559-3.152 1.82-3.432 2.521z"/>
+   <path fill="#dba300" d="m153.286 86.217c-0.271 0.681 1.636 1.977 2.591 1.09 1.023-0.886 2.25-1.704 2.659-1.977 1.84-1.228 1.159-2.114-1.909-1.568-3.068 0.547-3.068 1.773-3.341 2.455z"/>
+   <path fill="#d69e00" d="m153.345 86.207c-0.265 0.662 1.591 1.922 2.519 1.061 0.995-0.862 2.188-1.657 2.586-1.922 1.789-1.194 1.127-2.055-1.855-1.525-2.985 0.53-2.985 1.723-3.25 2.386z"/>
+   <path fill="#d19800" d="m153.404 86.197c-0.257 0.643 1.546 1.868 2.447 1.03 0.967-0.837 2.126-1.61 2.512-1.868 1.739-1.16 1.095-1.997-1.803-1.481-2.899 0.516-2.899 1.674-3.156 2.319z"/>
+   <path fill="#cc9200" d="m153.463 86.187c-0.25 0.625 1.5 1.813 2.375 1 0.939-0.813 2.064-1.563 2.439-1.813 1.688-1.126 1.063-1.938-1.75-1.438-2.814 0.5-2.814 1.625-3.064 2.251z"/>
+   <path fill="#c68c00" d="m153.521 86.176c-0.242 0.605 1.456 1.758 2.304 0.97 0.911-0.788 2.002-1.516 2.366-1.758 1.637-1.092 1.031-1.88-1.698-1.395-2.729 0.486-2.729 1.576-2.972 2.183z"/>
+   <path fill="#c18700" d="m153.58 86.166c-0.233 0.587 1.41 1.704 2.233 0.939 0.882-0.763 1.938-1.469 2.292-1.704 1.586-1.058 0.999-1.822-1.646-1.352-2.644 0.472-2.644 1.529-2.879 2.117z"/>
+   <path fill="#bc8100" d="m153.639 86.156c-0.228 0.568 1.364 1.649 2.16 0.91 0.854-0.739 1.878-1.422 2.219-1.649 1.536-1.024 0.967-1.764-1.593-1.308s-2.559 1.477-2.786 2.047z"/>
+   <path fill="#b77b00" d="m153.698 86.146c-0.22 0.549 1.32 1.594 2.089 0.879 0.825-0.715 1.815-1.375 2.146-1.595 1.484-0.99 0.935-1.705-1.54-1.265s-2.475 1.43-2.695 1.981z"/>
+   <path fill="#b27500" d="m153.756 86.135c-0.211 0.53 1.275 1.54 2.019 0.85 0.797-0.69 1.753-1.328 2.072-1.54 1.434-0.957 0.902-1.646-1.487-1.221s-2.391 1.38-2.604 1.911z"/>
+   <path fill="#ad7000" d="m153.815 86.125c-0.204 0.512 1.229 1.486 1.946 0.82 0.769-0.666 1.69-1.281 1.997-1.486 1.385-0.922 0.871-1.588-1.434-1.178s-2.304 1.331-2.509 1.844z"/>
+   <path fill="#a86a00" d="m153.874 86.114c-0.196 0.493 1.185 1.431 1.875 0.79 0.74-0.642 1.628-1.234 1.924-1.431 1.332-0.889 0.84-1.53-1.381-1.135s-2.221 1.283-2.418 1.776z"/>
+   <path fill="#a36400" d="m153.933 86.104c-0.189 0.474 1.139 1.376 1.803 0.759 0.712-0.617 1.566-1.187 1.851-1.376 1.281-0.855 0.808-1.472-1.329-1.092-2.135 0.38-2.135 1.234-2.325 1.709z"/>
+   <path fill="#9e5e00" d="m153.991 86.094c-0.181 0.455 1.095 1.322 1.732 0.729 0.684-0.592 1.504-1.14 1.776-1.321 1.231-0.821 0.775-1.414-1.274-1.048-2.051 0.364-2.051 1.184-2.234 1.64z"/>
+   <path fill="#995900" d="m154.05 86.083c-0.174 0.436 1.05 1.267 1.66 0.699 0.656-0.568 1.442-1.093 1.704-1.267 1.181-0.787 0.743-1.355-1.223-1.005s-1.966 1.136-2.141 1.573z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#fc0" d="m156.951 107.887c-0.229 2.858 6.343-4.286 6.743-4.915 0.856-1.543 3.715-5.886 4.172-7.715 0.857-3.2 2.401-5.543 1.429-8.915-0.343-1.086-2.742-1.372-3.829-0.687-3.086 1.829-2.629 4.058-2.972 6.115-1.143 5.831-5.143 11.717-5.543 16.117z"/>
+   <path fill="#ffcc02" d="m157.22 107.441c-0.22 2.787 6.178-4.188 6.566-4.802 0.833-1.506 3.614-5.745 4.056-7.529 0.831-3.122 2.333-5.408 1.382-8.695-0.337-1.058-2.678-1.333-3.735-0.663-3.006 1.788-2.557 3.96-2.889 5.967-1.105 5.685-4.997 11.431-5.38 15.722z"/>
+   <path fill="#ffcc05" d="m157.488 106.995c-0.209 2.715 6.014-4.091 6.392-4.69 0.811-1.469 3.513-5.603 3.941-7.342 0.804-3.043 2.264-5.273 1.331-8.474-0.329-1.031-2.61-1.295-3.64-0.64-2.927 1.747-2.486 3.863-2.806 5.818-1.068 5.541-4.851 11.146-5.218 15.328z"/>
+   <path fill="#ffcc07" d="m157.757 106.548c-0.198 2.645 5.85-3.993 6.217-4.577 0.785-1.431 3.409-5.461 3.824-7.156 0.779-2.964 2.196-5.138 1.282-8.253-0.322-1.003-2.543-1.257-3.545-0.618-2.847 1.706-2.414 3.766-2.722 5.67-1.031 5.398-4.706 10.862-5.056 14.934z"/>
+   <path fill="#ffcd0a" d="m158.026 106.102c-0.189 2.573 5.684-3.896 6.04-4.465 0.762-1.394 3.309-5.32 3.709-6.969 0.753-2.886 2.129-5.004 1.233-8.033-0.315-0.976-2.478-1.219-3.45-0.595-2.768 1.665-2.343 3.668-2.64 5.522-0.993 5.254-4.558 10.577-4.892 14.54z"/>
+   <path fill="#ffcd0c" d="m158.294 105.655c-0.179 2.503 5.52-3.798 5.865-4.351 0.738-1.357 3.207-5.179 3.594-6.783 0.727-2.807 2.061-4.869 1.185-7.813-0.309-0.948-2.411-1.18-3.356-0.572-2.687 1.623-2.271 3.571-2.556 5.374-0.958 5.11-4.414 10.291-4.732 14.145z"/>
+   <path fill="#ffcd0f" d="m158.563 105.209c-0.169 2.431 5.354-3.701 5.688-4.239 0.715-1.319 3.106-5.037 3.479-6.596 0.7-2.728 1.992-4.734 1.135-7.592-0.301-0.92-2.344-1.142-3.261-0.549-2.608 1.583-2.199 3.474-2.473 5.226-0.919 4.965-4.267 10.005-4.568 13.75z"/>
+   <path fill="#ffcd11" d="m158.831 104.762c-0.159 2.361 5.19-3.602 5.515-4.126 0.69-1.282 3.004-4.896 3.361-6.409 0.674-2.649 1.924-4.599 1.087-7.372-0.295-0.893-2.277-1.104-3.167-0.526-2.527 1.541-2.128 3.376-2.389 5.077-0.883 4.822-4.122 9.721-4.407 13.356z"/>
+   <path fill="#ffce14" d="m159.1 104.316c-0.149 2.289 5.024-3.505 5.338-4.014 0.667-1.244 2.901-4.754 3.247-6.223 0.646-2.571 1.854-4.464 1.037-7.151-0.287-0.865-2.211-1.065-3.072-0.504-2.448 1.5-2.056 3.279-2.306 4.929-0.845 4.679-3.976 9.437-4.244 12.963z"/>
+   <path fill="#ffce16" d="m159.369 103.869c-0.139 2.219 4.86-3.407 5.162-3.9 0.643-1.208 2.801-4.613 3.131-6.037 0.622-2.492 1.787-4.329 0.988-6.93-0.28-0.838-2.146-1.027-2.978-0.481-2.368 1.459-1.983 3.182-2.223 4.781-0.807 4.533-3.829 9.151-4.08 12.567z"/>
+   <path fill="#ffce19" d="m159.637 103.423c-0.13 2.147 4.695-3.31 4.986-3.788 0.62-1.17 2.699-4.471 3.016-5.85 0.596-2.414 1.719-4.195 0.939-6.71-0.273-0.81-2.079-0.989-2.883-0.458-2.289 1.418-1.913 3.084-2.139 4.632-0.77 4.391-3.684 8.866-3.919 12.174z"/>
+   <path fill="#ffce1c" d="m159.906 102.977c-0.119 2.076 4.531-3.213 4.811-3.676 0.597-1.133 2.599-4.33 2.899-5.664 0.57-2.335 1.651-4.06 0.891-6.49-0.267-0.782-2.012-0.95-2.787-0.435-2.21 1.377-1.842 2.987-2.057 4.484-0.734 4.247-3.539 8.582-3.757 11.781z"/>
+   <path fill="#ffcf1e" d="m160.174 102.53c-0.108 2.005 4.366-3.115 4.637-3.563 0.571-1.096 2.496-4.189 2.784-5.478 0.543-2.256 1.581-3.925 0.841-6.269-0.26-0.754-1.945-0.912-2.693-0.412-2.129 1.336-1.77 2.889-1.973 4.336-0.697 4.103-3.394 8.297-3.596 11.386z"/>
+   <path fill="#ffcf21" d="m160.443 102.084c-0.099 1.934 4.201-3.018 4.46-3.45 0.548-1.059 2.394-4.047 2.668-5.291 0.517-2.178 1.514-3.79 0.793-6.049-0.253-0.727-1.879-0.874-2.599-0.39-2.051 1.295-1.698 2.792-1.891 4.188-0.658 3.959-3.246 8.012-3.431 10.992z"/>
+   <path fill="#ffcf23" d="m160.712 101.637c-0.089 1.863 4.036-2.919 4.283-3.337 0.526-1.021 2.294-3.905 2.553-5.104 0.491-2.099 1.447-3.655 0.744-5.828-0.246-0.699-1.813-0.835-2.505-0.367-1.969 1.253-1.625 2.694-1.805 4.04-0.623 3.814-3.101 7.726-3.27 10.596z"/>
+   <path fill="#ffcf26" d="m160.98 101.191c-0.079 1.792 3.872-2.822 4.107-3.225 0.502-0.984 2.192-3.764 2.438-4.918 0.464-2.02 1.378-3.52 0.694-5.607-0.238-0.672-1.746-0.797-2.41-0.344-1.89 1.212-1.555 2.597-1.723 3.891-0.583 3.671-2.953 7.442-3.106 10.203z"/>
+   <path fill="#ffd028" d="m161.249 100.744c-0.068 1.721 3.707-2.724 3.933-3.112 0.478-0.947 2.091-3.623 2.321-4.731 0.439-1.942 1.311-3.386 0.646-5.387-0.232-0.645-1.68-0.758-2.316-0.321-1.81 1.171-1.481 2.5-1.639 3.743-0.548 3.527-2.809 7.156-2.945 9.808z"/>
+   <path fill="#ffd02b" d="m161.517 100.298c-0.06 1.65 3.543-2.627 3.757-2.999 0.454-0.91 1.989-3.481 2.206-4.545 0.413-1.863 1.242-3.25 0.597-5.167-0.225-0.617-1.613-0.72-2.221-0.298-1.73 1.13-1.411 2.402-1.557 3.595-0.509 3.383-2.662 6.871-2.782 9.414z"/>
+   <path fill="#ffd02d" d="m161.786 99.852c-0.049 1.579 3.377-2.529 3.581-2.887 0.431-0.872 1.887-3.34 2.091-4.359 0.387-1.784 1.173-3.116 0.547-4.946-0.217-0.589-1.546-0.682-2.126-0.275-1.649 1.089-1.339 2.305-1.472 3.446-0.474 3.24-2.518 6.587-2.621 9.021z"/>
+   <path fill="#ffd030" d="m162.055 99.405c-0.039 1.508 3.212-2.432 3.404-2.773 0.407-0.835 1.786-3.199 1.976-4.172 0.359-1.706 1.104-2.981 0.499-4.726-0.211-0.562-1.481-0.644-2.032-0.253-1.571 1.048-1.268 2.208-1.389 3.298-0.436 3.096-2.372 6.302-2.458 8.626z"/>
+   <path fill="#ffd133" d="m162.323 98.958c-0.029 1.437 3.048-2.334 3.23-2.661 0.383-0.798 1.684-3.057 1.858-3.986 0.334-1.627 1.037-2.846 0.45-4.505-0.204-0.534-1.414-0.605-1.938-0.23-1.49 1.007-1.195 2.11-1.306 3.15-0.397 2.953-2.224 6.018-2.294 8.232z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#fc0" d="m179.646 95.994c-3.168 3.456-5.4 6.767-7.2 9-1.872 2.304-6.48 5.04-4.176 7.704 1.943 2.376 9.936-1.944 16.128-6.552 6.12-4.608 15.696-8.711 11.016-13.967-2.448-2.664-8.208-2.088-10.439-0.648-1.729 1.078-2.737 1.655-5.329 4.463z"/>
+   <path fill="#ffcc02" d="m179.782 96.147c-3.118 3.378-5.313 6.628-7.086 8.809-1.841 2.249-6.375 4.945-4.13 7.534 1.893 2.31 9.724-1.943 15.795-6.469 6.001-4.525 15.38-8.574 10.82-13.682-2.387-2.588-8.022-1.998-10.209-0.584-1.692 1.062-2.665 1.67-5.19 4.392z"/>
+   <path fill="#ffcc05" d="m179.919 96.3c-3.068 3.3-5.227 6.488-6.973 8.619-1.81 2.193-6.271 4.85-4.085 7.364 1.843 2.243 9.513-1.943 15.463-6.386 5.882-4.442 15.064-8.437 10.623-13.396-2.323-2.513-7.835-1.907-9.978-0.52-1.655 1.044-2.593 1.684-5.05 4.319z"/>
+   <path fill="#ffcc07" d="m180.055 96.454c-3.02 3.222-5.14 6.347-6.859 8.428-1.78 2.138-6.166 4.754-4.04 7.194 1.793 2.177 9.302-1.942 15.131-6.303 5.762-4.359 14.748-8.299 10.427-13.11-2.261-2.437-7.648-1.817-9.747-0.456-1.619 1.025-2.522 1.698-4.912 4.247z"/>
+   <path fill="#ffcd0a" d="m180.191 96.607c-2.97 3.143-5.052 6.207-6.745 8.237-1.749 2.082-6.063 4.659-3.994 7.023 1.743 2.111 9.09-1.941 14.798-6.219 5.644-4.276 14.433-8.162 10.231-12.824-2.199-2.361-7.463-1.727-9.518-0.392-1.581 1.008-2.45 1.713-4.772 4.175z"/>
+   <path fill="#ffcd0c" d="m180.327 96.761c-2.92 3.065-4.965 6.066-6.631 8.047-1.718 2.027-5.957 4.564-3.949 6.853 1.693 2.044 8.878-1.94 14.466-6.136 5.524-4.194 14.116-8.024 10.034-12.538-2.137-2.286-7.275-1.636-9.285-0.328-1.546 0.988-2.38 1.726-4.635 4.102z"/>
+   <path fill="#ffcd0f" d="m180.464 96.914c-2.871 2.987-4.879 5.926-6.518 7.857-1.688 1.971-5.854 4.468-3.903 6.683 1.643 1.978 8.666-1.94 14.133-6.053 5.404-4.111 13.801-7.887 9.839-12.251-2.075-2.21-7.091-1.546-9.056-0.264-1.509 0.969-2.308 1.738-4.495 4.028z"/>
+   <path fill="#ffcd11" d="m180.6 97.067c-2.821 2.909-4.792 5.786-6.404 7.667-1.657 1.916-5.748 4.373-3.858 6.512 1.593 1.912 8.455-1.938 13.802-5.969 5.284-4.028 13.484-7.75 9.641-11.966-2.012-2.134-6.902-1.456-8.823-0.199-1.474 0.951-2.238 1.752-4.358 3.955z"/>
+   <path fill="#ffce14" d="m180.736 97.221c-2.771 2.83-4.705 5.645-6.29 7.476-1.626 1.86-5.644 4.278-3.813 6.342 1.542 1.845 8.244-1.938 13.47-5.886 5.166-3.945 13.169-7.612 9.444-11.68-1.949-2.059-6.716-1.365-8.592-0.135-1.437 0.933-2.166 1.766-4.219 3.883z"/>
+   <path fill="#ffce16" d="m180.872 97.375c-2.722 2.752-4.617 5.504-6.176 7.286-1.595 1.805-5.539 4.182-3.767 6.172 1.49 1.779 8.031-1.937 13.136-5.803 5.046-3.862 12.853-7.475 9.249-11.394-1.889-1.983-6.53-1.274-8.362-0.071-1.4 0.914-2.095 1.779-4.08 3.81z"/>
+   <path fill="#ffce19" d="m181.009 97.528c-2.673 2.674-4.53 5.364-6.063 7.095-1.564 1.749-5.435 4.087-3.722 6.001 1.44 1.713 7.82-1.936 12.804-5.719 4.927-3.78 12.537-7.338 9.052-11.108-1.825-1.907-6.343-1.185-8.13-0.007-1.364 0.896-2.024 1.793-3.941 3.738z"/>
+   <path fill="#ffce1c" d="m181.145 97.682c-2.623 2.595-4.444 5.225-5.949 6.904-1.534 1.693-5.33 3.992-3.676 5.831 1.39 1.646 7.608-1.935 12.471-5.636 4.808-3.697 12.221-7.2 8.856-10.822-1.764-1.832-6.157-1.094-7.9 0.057-1.327 0.878-1.952 1.807-3.802 3.666z"/>
+   <path fill="#ffcf1e" d="m181.281 97.835c-2.573 2.517-4.357 5.084-5.835 6.714-1.503 1.638-5.226 3.896-3.631 5.661 1.34 1.58 7.396-1.935 12.139-5.553 4.689-3.614 11.905-7.063 8.659-10.536-1.701-1.756-5.97-1.004-7.668 0.121-1.291 0.86-1.881 1.821-3.664 3.593z"/>
+   <path fill="#ffcf21" d="m181.417 97.988c-2.522 2.439-4.27 4.944-5.721 6.524-1.472 1.582-5.121 3.801-3.586 5.491 1.29 1.513 7.186-1.934 11.807-5.47 4.569-3.531 11.589-6.926 8.463-10.25-1.639-1.68-5.783-0.914-7.438 0.186-1.254 0.84-1.809 1.834-3.525 3.519z"/>
+   <path fill="#ffcf23" d="m181.554 98.142c-2.476 2.361-4.185 4.803-5.608 6.333-1.441 1.527-5.017 3.706-3.54 5.32 1.24 1.447 6.974-1.933 11.474-5.386 4.45-3.448 11.273-6.788 8.268-9.964-1.577-1.605-5.599-0.823-7.207 0.25-1.22 0.822-1.74 1.848-3.387 3.447z"/>
+   <path fill="#ffcf26" d="m181.69 98.295c-2.425 2.283-4.098 4.663-5.494 6.143-1.411 1.471-4.912 3.61-3.495 5.15 1.19 1.381 6.763-1.932 11.142-5.303 4.331-3.366 10.957-6.65 8.07-9.679-1.514-1.529-5.411-0.732-6.976 0.313-1.182 0.805-1.667 1.863-3.247 3.376z"/>
+   <path fill="#ffd028" d="m181.826 98.449c-2.375 2.204-4.009 4.522-5.38 5.952-1.38 1.416-4.808 3.515-3.449 4.98 1.14 1.314 6.551-1.932 10.81-5.22 4.211-3.283 10.641-6.513 7.874-9.393-1.452-1.454-5.226-0.642-6.745 0.378-1.147 0.786-1.597 1.876-3.11 3.303z"/>
+   <path fill="#ffd02b" d="m181.962 98.602c-2.324 2.127-3.922 4.382-5.266 5.762-1.349 1.36-4.703 3.42-3.404 4.809 1.089 1.248 6.34-1.93 10.478-5.136 4.092-3.2 10.325-6.376 7.677-9.106-1.389-1.378-5.038-0.552-6.513 0.441-1.111 0.768-1.526 1.89-2.972 3.23z"/>
+   <path fill="#ffd02d" d="m182.099 98.756c-2.276 2.048-3.836 4.241-5.153 5.571-1.318 1.305-4.599 3.324-3.359 4.639 1.039 1.182 6.128-1.93 10.146-5.053 3.973-3.117 10.009-6.238 7.48-8.82-1.328-1.303-4.852-0.462-6.282 0.506-1.074 0.748-1.454 1.903-2.832 3.157z"/>
+   <path fill="#ffd030" d="m182.235 98.909c-2.228 1.97-3.749 4.101-5.039 5.381-1.288 1.249-4.494 3.229-3.313 4.469 0.988 1.115 5.916-1.929 9.813-4.97 3.853-3.034 9.693-6.101 7.285-8.535-1.267-1.227-4.666-0.371-6.052 0.57-1.038 0.731-1.384 1.918-2.694 3.085z"/>
+   <path fill="#ffd133" d="m182.371 99.063c-2.177 1.892-3.662 3.96-4.925 5.19-1.257 1.193-4.39 3.133-3.268 4.298 0.938 1.049 5.704-1.928 9.479-4.886 3.734-2.952 9.377-5.963 7.088-8.249-1.203-1.151-4.479-0.281-5.821 0.634-0.999 0.713-1.31 1.931-2.553 3.013z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#fff" d="m186.414 168.569c0.864-2.808 28.872-9.432 33.48-7.272 4.536 2.16 26.279 33.768 22.392 35.496-3.888 1.657-12.24-10.512-24.408-16.128s-32.328-9.216-31.464-12.096z"/>
+   <path fill="#f9f9f9" d="m187.239 168.626c0.848-2.761 28.145-9.076 32.69-6.997 4.476 2.079 25.768 32.897 21.943 34.591-3.824 1.625-11.965-10.346-23.94-15.874-11.976-5.527-31.541-8.89-30.693-11.72z"/>
+   <path fill="#f4f4f4" d="m188.063 168.683c0.832-2.714 27.418-8.72 31.899-6.722 4.417 1.998 25.259 32.026 21.497 33.685-3.76 1.595-11.689-10.18-23.474-15.619-11.782-5.438-30.754-8.565-29.922-11.344z"/>
+   <path fill="#efefef" d="m188.888 168.74c0.814-2.668 26.69-8.364 31.109-6.447 4.357 1.917 24.746 31.155 21.049 32.779-3.695 1.563-11.416-10.014-23.007-15.364-11.59-5.349-29.967-8.239-29.151-10.968z"/>
+   <path fill="#eaeaea" d="m189.712 168.797c0.801-2.621 25.964-8.009 30.32-6.173 4.299 1.837 24.235 30.285 20.603 31.874-3.633 1.532-11.142-9.847-22.54-15.109-11.4-5.261-29.182-7.914-28.383-10.592z"/>
+   <path fill="#e5e5e5" d="m190.537 168.853c0.783-2.573 25.236-7.652 29.53-5.897 4.239 1.756 23.723 29.414 20.155 30.968-3.569 1.501-10.867-9.681-22.074-14.854-11.206-5.172-28.395-7.589-27.611-10.217z"/>
+   <path fill="#e0e0e0" d="m191.361 168.91c0.768-2.527 24.51-7.296 28.74-5.622 4.18 1.675 23.212 28.543 19.708 30.063-3.505 1.469-10.593-9.516-21.607-14.6-11.014-5.083-27.608-7.263-26.841-9.841z"/>
+   <path fill="#dbdbdb" d="m192.186 168.967c0.751-2.48 23.781-6.941 27.95-5.347 4.119 1.593 22.7 27.671 19.26 29.157-3.441 1.438-10.318-9.349-21.141-14.345-10.821-4.994-26.821-6.938-26.069-9.465z"/>
+   <path fill="#d6d6d6" d="m193.01 169.024c0.735-2.433 23.057-6.585 27.16-5.073 4.062 1.513 22.19 26.801 18.813 28.252-3.377 1.407-10.043-9.183-20.673-14.09-10.629-4.906-26.035-6.612-25.3-9.089z"/>
+   <path fill="#d1d1d1" d="m193.835 169.081c0.72-2.387 22.328-6.229 26.37-4.798 4.001 1.432 21.678 25.93 18.365 27.346-3.313 1.376-9.768-9.017-20.206-13.835-10.437-4.817-25.248-6.287-24.529-8.713z"/>
+   <path fill="#ccc" d="m194.659 169.137c0.703-2.339 21.603-5.873 25.58-4.521 3.942 1.351 21.167 25.059 17.918 26.44-3.249 1.345-9.493-8.851-19.739-13.58-10.245-4.729-24.462-5.963-23.759-8.339z"/>
+   <path fill="#c6c6c6" d="m195.484 169.194c0.687-2.292 20.874-5.517 24.79-4.247 3.882 1.27 20.655 24.188 17.47 25.535-3.185 1.314-9.219-8.685-19.271-13.326-10.054-4.639-23.676-5.636-22.989-7.962z"/>
+   <path fill="#c1c1c1" d="m196.308 169.251c0.671-2.246 20.147-5.161 24-3.973 3.822 1.19 20.145 23.318 17.022 24.63-3.121 1.283-8.943-8.519-18.805-13.071-9.859-4.551-22.888-5.311-22.217-7.586z"/>
+   <path fill="#bcbcbc" d="m197.133 169.308c0.654-2.199 19.421-4.805 23.21-3.698 3.764 1.109 19.634 22.447 16.575 23.724-3.057 1.252-8.669-8.353-18.338-12.816-9.668-4.462-22.102-4.985-21.447-7.21z"/>
+   <path fill="#b7b7b7" d="m197.957 169.365c0.64-2.152 18.693-4.45 22.42-3.423 3.705 1.027 19.122 21.575 16.129 22.818-2.993 1.221-8.395-8.186-17.872-12.561-9.476-4.373-21.315-4.66-20.677-6.834z"/>
+   <path fill="#b2b2b2" d="m198.782 169.421c0.622-2.105 17.966-4.093 21.63-3.147 3.646 0.946 18.61 20.704 15.681 21.912-2.93 1.19-8.12-8.02-17.404-12.306-9.284-4.284-20.53-4.335-19.907-6.459z"/>
+   <path fill="#adadad" d="m199.606 169.478c0.606-2.058 17.239-3.737 20.84-2.873 3.586 0.866 18.099 19.834 15.234 21.008-2.866 1.158-7.847-7.855-16.938-12.052-9.091-4.196-19.742-4.009-19.136-6.083z"/>
+   <path fill="#a8a8a8" d="m200.431 169.535c0.59-2.011 16.512-3.382 20.05-2.598 3.525 0.785 17.588 18.963 14.786 20.102-2.803 1.127-7.571-7.688-16.472-11.797-8.898-4.107-18.955-3.684-18.364-5.707z"/>
+   <path fill="#a3a3a3" d="m201.255 169.592c0.574-1.965 15.785-3.026 19.261-2.323 3.467 0.704 17.076 18.092 14.339 19.196-2.738 1.096-7.296-7.522-16.004-11.542-8.707-4.018-18.17-3.358-17.596-5.331z"/>
+   <path fill="#9e9e9e" d="m202.08 169.649c0.559-1.918 15.059-2.67 18.47-2.048 3.407 0.623 16.565 17.221 13.892 18.29-2.674 1.065-7.022-7.356-15.537-11.287-8.515-3.929-17.383-3.033-16.825-4.955z"/>
+   <path fill="#999" d="m202.904 169.705c0.542-1.871 14.331-2.314 17.68-1.773 3.349 0.542 16.055 16.35 13.444 17.385-2.61 1.034-6.747-7.19-15.07-11.032-8.322-3.841-16.596-2.708-16.054-4.58z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#fff" d="m151.134 211.625c2.881 0.144 0.145 16.271 0.145 32.903s2.231 22.464 0.144 24.552-5.688-5.399-5.688-22.031c-0.001-16.632 2.519-35.568 5.399-35.424z"/>
+   <path fill="#f9f9f9" d="m151.105 212.016c2.783 0.162 0.109 16.052 0.097 32.419-0.012 16.366 2.188 22.208 0.164 24.237-2.02 2.029-5.561-5.383-5.546-21.752 0.012-16.367 2.502-35.065 5.285-34.904z"/>
+   <path fill="#f4f4f4" d="m151.075 212.407c2.687 0.18 0.076 15.832 0.051 31.934-0.023 16.102 2.143 21.951 0.185 23.924-1.953 1.968-5.435-5.367-5.405-21.473 0.024-16.103 2.484-34.564 5.169-34.385z"/>
+   <path fill="#efefef" d="m151.046 212.797c2.588 0.197 0.041 15.613 0.004 31.449-0.036 15.836 2.098 21.694 0.204 23.609-1.886 1.907-5.308-5.352-5.263-21.195 0.037-15.835 2.467-34.058 5.055-33.863z"/>
+   <path fill="#eaeaea" d="m151.017 213.189c2.49 0.214 0.007 15.392-0.043 30.962-0.05 15.571 2.052 21.439 0.224 23.297-1.818 1.848-5.181-5.334-5.122-20.916 0.049-15.571 2.45-33.557 4.941-33.343z"/>
+   <path fill="#e5e5e5" d="m150.987 213.581c2.394 0.23-0.027 15.17-0.089 30.477s2.007 21.182 0.244 22.982c-1.751 1.787-5.055-5.32-4.98-20.638 0.061-15.305 2.431-33.053 4.825-32.821z"/>
+   <path fill="#e0e0e0" d="m150.958 213.971c2.297 0.248-0.062 14.951-0.136 29.99-0.074 15.041 1.962 20.927 0.264 22.668-1.683 1.728-4.928-5.301-4.839-20.356 0.074-15.04 2.414-32.551 4.711-32.302z"/>
+   <path fill="#dbdbdb" d="m150.928 214.362c2.199 0.266-0.096 14.73-0.182 29.506-0.087 14.775 1.915 20.67 0.282 22.354-1.615 1.667-4.8-5.286-4.696-20.078 0.087-14.776 2.397-32.048 4.596-31.782z"/>
+   <path fill="#d6d6d6" d="m150.899 214.752c2.102 0.283-0.13 14.511-0.229 29.021-0.099 14.511 1.87 20.413 0.303 22.04-1.549 1.607-4.674-5.27-4.556-19.799 0.1-14.51 2.38-31.545 4.482-31.262z"/>
+   <path fill="#d1d1d1" d="m150.87 215.144c2.005 0.301-0.165 14.29-0.274 28.535-0.112 14.245 1.824 20.155 0.321 21.725-1.479 1.548-4.547-5.252-4.413-19.519 0.11-14.245 2.361-31.043 4.366-30.741z"/>
+   <path fill="#ccc" d="m150.84 215.536c1.908 0.317-0.197 14.069-0.32 28.049-0.124 13.979 1.779 19.899 0.342 21.412-1.413 1.486-4.42-5.238-4.272-19.242 0.122-13.979 2.343-30.54 4.25-30.219z"/>
+   <path fill="#c6c6c6" d="m150.811 215.926c1.811 0.334-0.233 13.85-0.368 27.564-0.136 13.713 1.735 19.643 0.362 21.096-1.346 1.428-4.293-5.219-4.131-18.961 0.136-13.712 2.327-30.035 4.137-29.699z"/>
+   <path fill="#c1c1c1" d="m150.781 216.317c1.714 0.354-0.267 13.629-0.414 27.078s1.69 19.387 0.382 20.783c-1.277 1.367-4.166-5.203-3.989-18.682 0.148-13.449 2.308-29.533 4.021-29.179z"/>
+   <path fill="#bcbcbc" d="m150.752 216.708c1.616 0.371-0.301 13.41-0.461 26.594-0.161 13.184 1.646 19.13 0.402 20.469-1.211 1.307-4.04-5.188-3.847-18.402 0.16-13.185 2.29-29.033 3.906-28.661z"/>
+   <path fill="#b7b7b7" d="m150.723 217.099c1.519 0.387-0.336 13.188-0.509 26.106-0.173 12.92 1.601 18.875 0.423 20.156-1.144 1.246-3.913-5.171-3.706-18.123 0.172-12.919 2.273-28.529 3.792-28.139z"/>
+   <path fill="#b2b2b2" d="m150.693 217.491c1.422 0.404-0.37 12.969-0.554 25.621-0.186 12.653 1.555 18.617 0.441 19.842-1.076 1.187-3.786-5.156-3.563-17.846 0.184-12.652 2.255-28.024 3.676-27.617z"/>
+   <path fill="#adadad" d="m150.664 217.881c1.325 0.422-0.404 12.748-0.601 25.136-0.198 12.388 1.51 18.36 0.462 19.528-1.008 1.125-3.66-5.139-3.423-17.566 0.197-12.389 2.238-27.521 3.562-27.098z"/>
+   <path fill="#a8a8a8" d="m150.634 218.272c1.229 0.439-0.438 12.527-0.646 24.65-0.21 12.123 1.464 18.104 0.48 19.213-0.939 1.066-3.531-5.121-3.279-17.285 0.208-12.123 2.219-27.019 3.445-26.578z"/>
+   <path fill="#a3a3a3" d="m150.605 218.663c1.13 0.457-0.474 12.309-0.694 24.166-0.222 11.857 1.419 17.848 0.501 18.899-0.873 1.006-3.405-5.106-3.139-17.009 0.222-11.855 2.202-26.515 3.332-26.056z"/>
+   <path fill="#9e9e9e" d="m150.576 219.054c1.033 0.474-0.507 12.088-0.741 23.68-0.234 11.593 1.374 17.591 0.521 18.585-0.806 0.946-3.279-5.089-2.997-16.729 0.233-11.591 2.184-26.011 3.217-25.536z"/>
+   <path fill="#999" d="m150.546 219.444c0.937 0.492-0.541 11.868-0.787 23.195-0.246 11.326 1.329 17.335 0.541 18.271-0.737 0.885-3.151-5.074-2.855-16.449 0.245-11.328 2.166-25.509 3.101-25.017z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#fff" d="m157.434 167.161c1.735 0.192 12.437-2.218 12.822-1.254 0.386 0.772-6.651 2.893-8.966 5.303-0.771 0.771-2.796 2.603-4.049 2.41-0.964-0.096-1.543-2.121-2.989-3.664-3.471-3.47-5.688-3.181-5.013-4.531 0.579-1.06 5.207 1.446 8.195 1.736z"/>
+   <path fill="#fbfbfb" d="m157.479 167.201c1.7 0.188 12.176-2.171 12.554-1.227 0.377 0.755-6.512 2.832-8.778 5.191-0.755 0.755-2.736 2.549-3.964 2.36-0.942-0.094-1.51-2.077-2.926-3.587-3.398-3.397-5.568-3.115-4.907-4.436 0.565-1.038 5.096 1.415 8.021 1.699z"/>
+   <path fill="#f8f8f8" d="m157.525 167.241c1.663 0.184 11.914-2.124 12.283-1.201 0.369 0.739-6.372 2.771-8.589 5.08-0.738 0.739-2.679 2.494-3.879 2.309-0.924-0.092-1.479-2.032-2.863-3.51-3.325-3.324-5.449-3.048-4.803-4.341 0.555-1.015 4.988 1.385 7.851 1.663z"/>
+   <path fill="#f5f5f5" d="m157.57 167.281c1.626 0.18 11.652-2.078 12.014-1.175 0.361 0.723-6.231 2.711-8.4 4.969-0.723 0.722-2.619 2.439-3.793 2.258-0.903-0.09-1.446-1.987-2.802-3.433-3.252-3.251-5.329-2.981-4.695-4.245 0.54-0.993 4.876 1.354 7.676 1.626z"/>
+   <path fill="#f2f2f2" d="m157.615 167.321c1.59 0.176 11.391-2.031 11.745-1.148 0.352 0.706-6.093 2.649-8.212 4.856-0.707 0.707-2.562 2.385-3.709 2.208-0.883-0.088-1.413-1.943-2.738-3.356-3.179-3.178-5.209-2.914-4.591-4.15 0.529-0.971 4.768 1.324 7.505 1.59z"/>
+   <path fill="#efefef" d="m157.66 167.361c1.554 0.172 11.13-1.985 11.475-1.122 0.346 0.69-5.952 2.589-8.022 4.745-0.69 0.69-2.503 2.33-3.624 2.157-0.863-0.086-1.381-1.898-2.675-3.279-3.106-3.105-5.09-2.847-4.486-4.055 0.517-0.948 4.658 1.294 7.332 1.554z"/>
+   <path fill="#ebebeb" d="m157.705 167.401c1.518 0.168 10.868-1.938 11.206-1.096 0.336 0.674-5.813 2.528-7.835 4.634-0.674 0.674-2.444 2.275-3.539 2.106-0.842-0.084-1.348-1.853-2.612-3.202-3.032-3.032-4.97-2.78-4.38-3.959 0.505-0.926 4.549 1.263 7.16 1.517z"/>
+   <path fill="#e8e8e8" d="m157.751 167.441c1.48 0.164 10.606-1.892 10.936-1.069 0.329 0.657-5.673 2.467-7.646 4.522-0.658 0.657-2.385 2.22-3.453 2.055-0.822-0.082-1.315-1.809-2.549-3.124-2.96-2.96-4.851-2.714-4.275-3.865 0.491-0.904 4.438 1.233 6.987 1.481z"/>
+   <path fill="#e5e5e5" d="m157.796 167.481c1.444 0.16 10.346-1.845 10.666-1.043 0.32 0.641-5.532 2.406-7.458 4.41-0.641 0.642-2.325 2.166-3.367 2.005-0.803-0.08-1.284-1.764-2.486-3.047-2.887-2.887-4.732-2.647-4.17-3.769 0.48-0.882 4.329 1.202 6.815 1.444z"/>
+   <path fill="#e2e2e2" d="m157.841 167.521c1.407 0.156 10.083-1.799 10.397-1.017 0.312 0.625-5.394 2.346-7.271 4.299-0.625 0.625-2.267 2.111-3.282 1.954-0.782-0.078-1.251-1.719-2.423-2.97-2.814-2.814-4.612-2.58-4.065-3.674 0.469-0.859 4.221 1.172 6.644 1.408z"/>
+   <path fill="#dfdfdf" d="m157.886 167.56c1.37 0.152 9.821-1.751 10.127-0.99 0.304 0.609-5.254 2.285-7.081 4.188-0.609 0.609-2.208 2.056-3.198 1.903-0.761-0.076-1.218-1.675-2.36-2.893-2.741-2.741-4.492-2.513-3.959-3.579 0.456-0.837 4.111 1.142 6.471 1.371z"/>
+   <path fill="#dbdbdb" d="m157.931 167.6c1.335 0.148 9.561-1.704 9.857-0.963 0.296 0.592-5.114 2.223-6.893 4.076-0.593 0.593-2.149 2.001-3.113 1.853-0.741-0.074-1.186-1.631-2.297-2.817-2.668-2.667-4.373-2.446-3.854-3.483 0.445-0.815 4.003 1.111 6.3 1.334z"/>
+   <path fill="#d8d8d8" d="m157.977 167.64c1.298 0.144 9.299-1.658 9.587-0.937 0.288 0.576-4.974 2.163-6.704 3.964-0.576 0.577-2.091 1.947-3.027 1.803-0.721-0.072-1.153-1.586-2.234-2.74-2.596-2.594-4.253-2.379-3.748-3.388 0.431-0.792 3.891 1.081 6.126 1.298z"/>
+   <path fill="#d5d5d5" d="m158.022 167.68c1.261 0.14 9.037-1.611 9.317-0.911 0.28 0.56-4.834 2.102-6.516 3.853-0.56 0.561-2.032 1.892-2.942 1.752-0.7-0.07-1.12-1.541-2.172-2.663-2.521-2.521-4.133-2.312-3.643-3.292 0.421-0.77 3.784 1.05 5.956 1.261z"/>
+   <path fill="#d2d2d2" d="m158.067 167.72c1.225 0.136 8.775-1.564 9.049-0.884 0.271 0.543-4.695 2.041-6.327 3.741-0.545 0.544-1.974 1.837-2.857 1.701-0.682-0.068-1.09-1.497-2.109-2.585-2.449-2.449-4.014-2.246-3.538-3.198 0.407-0.748 3.673 1.02 5.782 1.225z"/>
+   <path fill="#cfcfcf" d="m158.112 167.76c1.188 0.132 8.515-1.518 8.779-0.858 0.264 0.527-4.555 1.98-6.139 3.63-0.527 0.528-1.915 1.782-2.772 1.65-0.66-0.066-1.057-1.452-2.046-2.508-2.376-2.376-3.895-2.179-3.433-3.103 0.397-0.725 3.565 0.99 5.611 1.189z"/>
+   <path fill="#ccc" d="m158.157 167.8c1.152 0.128 8.253-1.472 8.51-0.832 0.255 0.511-4.415 1.92-5.95 3.518-0.512 0.512-1.855 1.728-2.688 1.6-0.64-0.064-1.023-1.407-1.983-2.431-2.303-2.303-3.773-2.112-3.326-3.007 0.383-0.703 3.454 0.959 5.437 1.152z"/>
+   <path fill="#c8c8c8" d="m158.203 167.84c1.115 0.124 7.991-1.425 8.239-0.805 0.248 0.494-4.274 1.858-5.761 3.406-0.496 0.496-1.798 1.673-2.603 1.549-0.62-0.063-0.992-1.363-1.921-2.354-2.229-2.229-3.655-2.045-3.221-2.912 0.372-0.681 3.346 0.929 5.267 1.116z"/>
+   <path fill="#c5c5c5" d="m158.248 167.88c1.079 0.12 7.73-1.379 7.97-0.779 0.239 0.478-4.135 1.798-5.572 3.295-0.479 0.479-1.739 1.618-2.518 1.498-0.6-0.06-0.959-1.318-1.857-2.277-2.157-2.157-3.535-1.978-3.116-2.816 0.359-0.659 3.235 0.898 5.093 1.079z"/>
+   <path fill="#c2c2c2" d="m158.293 167.92c1.042 0.116 7.469-1.332 7.701-0.753 0.231 0.462-3.995 1.737-5.385 3.184-0.463 0.463-1.68 1.563-2.432 1.447-0.579-0.058-0.927-1.273-1.796-2.2-2.084-2.084-3.415-1.911-3.01-2.721 0.348-0.636 3.127 0.868 4.922 1.043z"/>
+   <path fill="#bfbfbf" d="m158.338 167.959c1.007 0.112 7.207-1.285 7.432-0.726 0.223 0.446-3.855 1.676-5.196 3.072-0.447 0.447-1.621 1.509-2.347 1.397-0.56-0.056-0.895-1.229-1.732-2.123-2.011-2.011-3.296-1.844-2.905-2.626 0.334-0.614 3.016 0.838 4.748 1.006z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m194.253 11.922c-1.222 2.631-3.812 23.214-0.248 20.892 3.594-2.341 13.57-5.312 19.886-7.013 7.003-1.886-17.188-19.463-19.638-13.879z"/>
+   <path fill="#060606" d="m194.485 12.307c-1.21 2.594-3.704 22.255-0.234 20.007 3.491-2.262 13.077-5.1 19.039-6.782 6.59-1.905-16.436-18.609-18.805-13.225z"/>
+   <path fill="#0c0c0c" d="m194.717 12.691c-1.198 2.557-3.595 21.296-0.221 19.124 3.391-2.184 12.586-4.888 18.194-6.551 6.177-1.924-15.684-17.757-17.973-12.573z"/>
+   <path fill="#131313" d="m194.949 13.076c-1.187 2.52-3.487 20.337-0.207 18.239 3.288-2.105 12.093-4.676 17.348-6.321 5.763-1.941-14.933-16.903-17.141-11.918z"/>
+   <path fill="#191919" d="m195.181 13.46c-1.177 2.483-3.379 19.378-0.193 17.355 3.187-2.027 11.6-4.464 16.502-6.09 5.349-1.959-14.182-16.05-16.309-11.265z"/>
+   <path fill="#1f1f1f" d="m195.413 13.845c-1.164 2.446-3.27 18.419-0.18 16.471 3.086-1.949 11.107-4.252 15.657-5.859 4.935-1.978-13.43-15.198-15.477-10.612z"/>
+   <path fill="#262626" d="m195.645 14.229c-1.153 2.409-3.162 17.46-0.166 15.586 2.983-1.87 10.616-4.04 14.811-5.628 4.521-1.995-12.679-14.344-14.645-9.958z"/>
+   <path fill="#2c2c2c" d="m195.878 14.614c-1.142 2.372-3.055 16.501-0.152 14.702 2.882-1.792 10.123-3.828 13.965-5.398 4.107-2.013-11.929-13.49-13.813-9.304z"/>
+   <path fill="#333" d="m196.11 14.999c-1.131 2.335-2.946 15.542-0.14 13.817 2.78-1.713 9.631-3.616 13.119-5.167 3.695-2.031-11.175-12.637-12.979-8.65z"/>
+   <path fill="#393939" d="m196.342 15.383c-1.118 2.299-2.838 14.583-0.126 12.934 2.68-1.636 9.139-3.404 12.274-4.937 3.28-2.049-10.425-11.784-12.148-7.997z"/>
+   <path fill="#3f3f3f" d="m196.574 15.768c-1.108 2.261-2.729 13.624-0.112 12.049 2.577-1.557 8.646-3.192 11.429-4.706 2.865-2.068-9.675-10.931-11.317-7.343z"/>
+   <path fill="#464646" d="m196.806 16.152c-1.097 2.225-2.622 12.665-0.1 11.165 2.477-1.479 8.154-2.98 10.583-4.475 2.453-2.086-8.922-10.078-10.483-6.69z"/>
+   <path fill="#4c4c4c" d="m197.038 16.537c-1.085 2.188-2.513 11.706-0.085 10.28 2.374-1.4 7.661-2.768 9.737-4.244 2.039-2.104-8.171-9.225-9.652-6.036z"/>
+   <path fill="#525252" d="m197.27 16.921c-1.073 2.151-2.405 10.747-0.071 9.396 2.272-1.322 7.168-2.556 8.891-4.013 1.625-2.122-7.42-8.371-8.82-5.383z"/>
+   <path fill="#595959" d="m197.502 17.306c-1.062 2.113-2.297 9.788-0.058 8.512 2.172-1.244 6.677-2.344 8.046-3.783 1.211-2.14-6.669-7.518-7.988-4.729z"/>
+   <path fill="#5f5f5f" d="m197.734 17.69c-1.05 2.077-2.188 8.829-0.044 7.627 2.069-1.165 6.184-2.132 7.2-3.552 0.797-2.157-5.917-6.664-7.156-4.075z"/>
+   <path fill="#666" d="m197.966 18.075c-1.038 2.04-2.079 7.87-0.029 6.743 1.968-1.087 5.69-1.92 6.354-3.321 0.382-2.176-5.167-5.812-6.325-3.422z"/>
+   <path fill="#6c6c6c" d="m198.198 18.459c-1.027 2.003-1.972 6.911-0.017 5.859 1.866-1.008 5.198-1.708 5.509-3.09-0.03-2.194-4.415-4.959-5.492-2.769z"/>
+   <path fill="#727272" d="m198.43 18.844c-1.017 1.966-1.863 5.952-0.003 4.975 1.765-0.93 4.706-1.496 4.662-2.86-0.443-2.212-3.662-4.106-4.659-2.115z"/>
+   <path fill="#797979" d="m198.662 19.228c-1.004 1.929-1.755 4.993 0.011 4.09 1.663-0.852 4.215-1.284 3.817-2.629-0.858-2.23-2.912-3.251-3.828-1.461z"/>
+   <path fill="#7f7f7f" d="m198.894 19.612c-0.993 1.892-1.647 4.034 0.023 3.206 1.563-0.773 3.723-1.072 2.973-2.398-1.272-2.248-2.161-2.399-2.996-0.808z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m143.502 46.386c-0.72 2.16 8.712 5.112 10.801 6.984 2.808 2.52 3.023 7.488 6.336 5.472 2.159-1.296 0.504-4.176-3.456-8.568-5.833-6.481-13.033-5.689-13.681-3.888z"/>
+   <path fill="#050505" d="m143.991 46.582c-0.716 2.073 8.275 4.9 10.336 6.741 2.745 2.457 2.961 7.249 6.146 5.313 2.094-1.254 0.449-4.072-3.343-8.28-5.574-6.203-12.491-5.505-13.139-3.774z"/>
+   <path fill="#0a0a0a" d="m144.479 46.779c-0.71 1.987 7.839 4.688 9.873 6.498 2.682 2.394 2.897 7.009 5.956 5.154 2.028-1.212 0.395-3.968-3.228-7.993-5.319-5.926-11.953-5.321-12.601-3.659z"/>
+   <path fill="#0f0f0f" d="m144.967 46.976c-0.704 1.9 7.403 4.476 9.41 6.254 2.62 2.33 2.835 6.77 5.766 4.995 1.964-1.171 0.342-3.864-3.112-7.706-5.064-5.647-11.415-5.137-12.064-3.543z"/>
+   <path fill="#141414" d="m145.456 47.172c-0.701 1.813 6.966 4.263 8.946 6.011 2.557 2.266 2.772 6.53 5.575 4.835 1.897-1.129 0.287-3.76-2.998-7.418-4.807-5.369-10.874-4.952-11.523-3.428z"/>
+   <path fill="#191919" d="m145.944 47.369c-0.696 1.726 6.53 4.051 8.483 5.768 2.493 2.203 2.71 6.291 5.385 4.676 1.833-1.087 0.231-3.656-2.884-7.13-4.551-5.093-10.335-4.769-10.984-3.314z"/>
+   <path fill="#1e1e1e" d="m146.433 47.565c-0.692 1.64 6.093 3.839 8.019 5.525 2.431 2.14 2.647 6.052 5.194 4.517 1.768-1.046 0.179-3.552-2.77-6.843-4.293-4.814-9.794-4.585-10.443-3.199z"/>
+   <path fill="#232323" d="m146.921 47.762c-0.686 1.553 5.657 3.627 7.558 5.282 2.367 2.076 2.583 5.813 5.003 4.357 1.702-1.003 0.124-3.448-2.654-6.555-4.04-4.537-9.257-4.401-9.907-3.084z"/>
+   <path fill="#282828" d="m147.409 47.959c-0.681 1.466 5.221 3.415 7.094 5.039 2.305 2.013 2.521 5.573 4.813 4.198 1.637-0.962 0.07-3.344-2.54-6.268-3.782-4.26-8.717-4.218-9.367-2.969z"/>
+   <path fill="#2d2d2d" d="m147.898 48.156c-0.677 1.379 4.784 3.203 6.63 4.795 2.242 1.949 2.457 5.333 4.622 4.039 1.572-0.92 0.016-3.24-2.425-5.98-3.526-3.983-8.177-4.034-8.827-2.854z"/>
+   <path fill="#333" d="m148.386 48.353c-0.673 1.292 4.348 2.99 6.167 4.552 2.179 1.886 2.394 5.095 4.432 3.88 1.506-0.878-0.038-3.136-2.312-5.693-3.268-3.705-7.636-3.85-8.287-2.739z"/>
+   <path fill="#383838" d="m148.875 48.549c-0.668 1.206 3.911 2.778 5.703 4.309 2.116 1.823 2.331 4.855 4.242 3.721 1.439-0.836-0.093-3.032-2.197-5.405-3.013-3.428-7.098-3.667-7.748-2.625z"/>
+   <path fill="#3d3d3d" d="m149.363 48.746c-0.662 1.119 3.475 2.566 5.24 4.065 2.053 1.759 2.268 4.616 4.052 3.562 1.375-0.795-0.147-2.928-2.082-5.118-2.757-3.15-6.559-3.483-7.21-2.509z"/>
+   <path fill="#424242" d="m149.851 48.942c-0.657 1.032 3.039 2.354 4.776 3.823 1.99 1.696 2.205 4.376 3.861 3.402 1.31-0.753-0.201-2.824-1.967-4.831-2.5-2.871-6.018-3.298-6.67-2.394z"/>
+   <path fill="#474747" d="m150.34 49.139c-0.652 0.946 2.603 2.142 4.313 3.58 1.927 1.632 2.143 4.137 3.671 3.243 1.244-0.712-0.256-2.72-1.853-4.543-2.245-2.595-5.48-3.115-6.131-2.28z"/>
+   <path fill="#4c4c4c" d="m150.828 49.336c-0.647 0.859 2.166 1.93 3.851 3.336 1.863 1.569 2.079 3.898 3.48 3.084 1.179-0.67-0.31-2.616-1.739-4.255-1.988-2.317-4.94-2.932-5.592-2.165z"/>
+   <path fill="#515151" d="m151.317 49.533c-0.645 0.772 1.729 1.718 3.386 3.093 1.802 1.505 2.018 3.658 3.29 2.925 1.114-0.628-0.364-2.512-1.624-3.968-1.732-2.04-4.4-2.748-5.052-2.05z"/>
+   <path fill="#565656" d="m151.805 49.729c-0.639 0.685 1.293 1.505 2.923 2.85 1.738 1.442 1.954 3.419 3.1 2.766 1.048-0.586-0.418-2.408-1.509-3.681-1.476-1.762-3.862-2.563-4.514-1.935z"/>
+   <path fill="#5b5b5b" d="m152.293 49.926c-0.633 0.598 0.857 1.293 2.46 2.606 1.677 1.379 1.892 3.18 2.91 2.606 0.983-0.544-0.473-2.304-1.395-3.393-1.22-1.483-3.322-2.379-3.975-1.819z"/>
+   <path fill="#606060" d="m152.782 50.123c-0.629 0.512 0.42 1.081 1.996 2.363 1.613 1.315 1.828 2.94 2.719 2.447 0.918-0.502-0.525-2.2-1.28-3.105-0.963-1.207-2.782-2.196-3.435-1.705z"/>
+   <path fill="#666" d="m153.27 50.319c-0.624 0.425-0.017 0.869 1.533 2.12 1.55 1.252 1.765 2.701 2.528 2.288 0.853-0.461-0.581-2.096-1.166-2.818-0.706-0.929-2.242-2.012-2.895-1.59z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m193.47 45.594c-0.072 1.08 2.951 1.728 4.896 2.448 1.944 0.648 5.76 3.24 7.56 5.256 1.801 1.944 5.688 7.704 6.553 6.192 0.863-1.368-2.017-5.328-2.809-6.984s-3.239-5.256-7.128-6.48c-3.384-1.008-9-1.297-9.072-0.432z"/>
+   <path fill="#060606" d="m193.779 45.67c-0.071 1.05 2.869 1.685 4.758 2.387 1.891 0.633 5.598 3.161 7.345 5.122 1.747 1.893 5.535 7.493 6.376 6.027 0.84-1.328-1.936-5.173-2.738-6.795-0.8-1.622-3.175-5.09-6.952-6.301-3.282-0.995-8.718-1.28-8.789-0.44z"/>
+   <path fill="#0c0c0c" d="m194.088 45.747c-0.07 1.021 2.785 1.641 4.62 2.327 1.836 0.618 5.436 3.081 7.131 4.988 1.692 1.842 5.382 7.282 6.198 5.862 0.814-1.288-1.855-5.019-2.67-6.607-0.808-1.587-3.11-4.925-6.776-6.122-3.178-0.983-8.433-1.264-8.503-0.448z"/>
+   <path fill="#131313" d="m194.397 45.824c-0.071 0.991 2.702 1.598 4.481 2.267 1.782 0.603 5.272 3.001 6.916 4.854 1.64 1.791 5.229 7.071 6.022 5.697 0.788-1.248-1.776-4.865-2.603-6.418-0.815-1.554-3.044-4.759-6.599-5.942-3.073-0.973-8.148-1.251-8.217-0.458z"/>
+   <path fill="#191919" d="m194.706 45.9c-0.069 0.961 2.618 1.555 4.345 2.206 1.728 0.588 5.109 2.922 6.7 4.721 1.586 1.74 5.075 6.86 5.846 5.531 0.764-1.207-1.696-4.711-2.532-6.23-0.824-1.519-2.979-4.593-6.424-5.763-2.972-0.959-7.866-1.234-7.935-0.465z"/>
+   <path fill="#1f1f1f" d="m195.015 45.977c-0.07 0.931 2.534 1.511 4.207 2.146 1.672 0.573 4.945 2.843 6.485 4.586 1.531 1.689 4.921 6.649 5.668 5.367 0.738-1.167-1.616-4.557-2.464-6.042-0.832-1.485-2.914-4.428-6.247-5.583-2.868-0.948-7.581-1.219-7.649-0.474z"/>
+   <path fill="#262626" d="m195.324 46.054c-0.069 0.901 2.451 1.468 4.069 2.085 1.618 0.557 4.784 2.763 6.271 4.453 1.479 1.638 4.769 6.438 5.491 5.201 0.714-1.127-1.536-4.402-2.396-5.854-0.839-1.451-2.848-4.263-6.07-5.404-2.765-0.934-7.298-1.202-7.365-0.481z"/>
+   <path fill="#2c2c2c" d="m195.632 46.13c-0.067 0.872 2.369 1.424 3.933 2.025 1.563 0.542 4.621 2.684 6.056 4.318 1.424 1.587 4.615 6.228 5.315 5.036 0.688-1.086-1.456-4.248-2.326-5.665-0.848-1.416-2.783-4.097-5.896-5.224-2.662-0.923-7.015-1.187-7.082-0.49z"/>
+   <path fill="#333" d="m195.941 46.207c-0.068 0.842 2.285 1.381 3.794 1.964 1.51 0.527 4.458 2.605 5.842 4.185 1.37 1.536 4.461 6.016 5.138 4.871 0.662-1.046-1.377-4.093-2.258-5.476-0.855-1.382-2.718-3.932-5.718-5.045-2.56-0.911-6.732-1.172-6.798-0.499z"/>
+   <path fill="#393939" d="m196.25 46.284c-0.066 0.813 2.202 1.338 3.656 1.904 1.456 0.512 4.296 2.525 5.627 4.051 1.317 1.485 4.308 5.805 4.961 4.706 0.638-1.006-1.296-3.939-2.188-5.288-0.863-1.348-2.652-3.766-5.542-4.866-2.457-0.899-6.449-1.157-6.514-0.507z"/>
+   <path fill="#3f3f3f" d="m196.559 46.36c-0.067 0.783 2.118 1.295 3.518 1.844 1.402 0.497 4.133 2.446 5.412 3.917 1.263 1.434 4.155 5.594 4.785 4.541 0.612-0.966-1.217-3.785-2.12-5.1-0.872-1.313-2.587-3.6-5.366-4.687-2.353-0.886-6.165-1.141-6.229-0.515z"/>
+   <path fill="#464646" d="m196.868 46.437c-0.065 0.753 2.035 1.251 3.38 1.783 1.349 0.482 3.972 2.367 5.197 3.783 1.21 1.383 4.002 5.383 4.608 4.375 0.588-0.926-1.137-3.63-2.052-4.911-0.879-1.279-2.521-3.435-5.189-4.507-2.25-0.874-5.881-1.125-5.944-0.523z"/>
+   <path fill="#4c4c4c" d="m197.177 46.514c-0.066 0.723 1.95 1.208 3.241 1.723 1.293 0.467 3.809 2.287 4.983 3.649 1.155 1.332 3.848 5.172 4.431 4.21 0.563-0.885-1.057-3.476-1.982-4.723-0.888-1.245-2.456-3.269-5.014-4.328-2.146-0.862-5.597-1.109-5.659-0.531z"/>
+   <path fill="#525252" d="m197.486 46.591c-0.066 0.693 1.868 1.164 3.104 1.662 1.239 0.452 3.646 2.208 4.769 3.515 1.102 1.281 3.695 4.961 4.254 4.045 0.537-0.845-0.976-3.321-1.913-4.534-0.896-1.21-2.391-3.103-4.838-4.148-2.044-0.851-5.315-1.095-5.376-0.54z"/>
+   <path fill="#595959" d="m197.795 46.667c-0.064 0.664 1.784 1.121 2.968 1.602 1.184 0.437 3.481 2.128 4.552 3.381 1.049 1.23 3.542 4.75 4.078 3.88 0.512-0.805-0.897-3.167-1.846-4.346-0.902-1.176-2.325-2.938-4.66-3.969-1.942-0.838-5.031-1.078-5.092-0.548z"/>
+   <path fill="#5f5f5f" d="m198.104 46.744c-0.065 0.634 1.701 1.078 2.829 1.541 1.13 0.421 3.318 2.049 4.338 3.248 0.994 1.179 3.388 4.539 3.899 3.715 0.487-0.765-0.815-3.013-1.775-4.157-0.911-1.142-2.261-2.772-4.485-3.79-1.837-0.826-4.746-1.064-4.806-0.557z"/>
+   <path fill="#666" d="m198.413 46.821c-0.063 0.604 1.617 1.034 2.691 1.481 1.076 0.406 3.157 1.969 4.123 3.113 0.94 1.128 3.234 4.328 3.724 3.55 0.462-0.725-0.737-2.858-1.707-3.969-0.919-1.108-2.195-2.606-4.309-3.61-1.734-0.814-4.463-1.049-4.522-0.565z"/>
+   <path fill="#6c6c6c" d="m198.721 46.897c-0.063 0.574 1.534 0.991 2.554 1.42 1.021 0.391 2.994 1.89 3.908 2.979 0.887 1.077 3.082 4.117 3.548 3.384 0.436-0.685-0.657-2.704-1.64-3.78-0.927-1.074-2.13-2.44-4.132-3.431-1.631-0.8-4.179-1.031-4.238-0.572z"/>
+   <path fill="#727272" d="m199.03 46.974c-0.063 0.544 1.451 0.948 2.416 1.36 0.967 0.376 2.831 1.811 3.694 2.846 0.833 1.026 2.928 3.906 3.369 3.219 0.411-0.644-0.576-2.549-1.569-3.592-0.936-1.04-2.064-2.275-3.956-3.251-1.528-0.79-3.896-1.017-3.954-0.582z"/>
+   <path fill="#797979" d="m199.339 47.051c-0.062 0.515 1.368 0.904 2.278 1.299 0.913 0.361 2.669 1.731 3.479 2.712 0.779 0.975 2.774 3.695 3.193 3.054 0.386-0.604-0.497-2.396-1.501-3.403-0.942-1.005-1.999-2.11-3.78-3.072-1.424-0.778-3.612-1.002-3.669-0.59z"/>
+   <path fill="#7f7f7f" d="m199.648 47.127c-0.063 0.485 1.284 0.861 2.14 1.239 0.859 0.346 2.506 1.652 3.265 2.578 0.726 0.924 2.621 3.484 3.017 2.889 0.361-0.564-0.417-2.241-1.432-3.215-0.951-0.971-1.935-1.944-3.604-2.893-1.323-0.765-3.33-0.986-3.386-0.598z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#995900" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-20.017 11.592-31.104 19.152-13.968 9.576-18.792 13.824-23.328 18.359-7.056 7.057-13.752 9.432-24.48 9.432s-15.552-2.231-18.863-5.184c-3.313-2.88-6.984-10.225-6.624-21.168 0.288-10.872 3.744-20.809 5.399-37.729 0.721-7.271 0.648-16.271 0.648-24.264 0-10.08 0.144-18.648 2.304-19.943 3.889-2.448 4.752-2.592 9.36-2.592 4.607 0 6.696 0.287 8.208 1.799 1.439 1.44 0.864 4.752 0.359 9.433-0.432 4.681 1.801 6.192 4.032 8.136 2.232 1.872 4.248 4.248 11.305 4.824 7.056 0.504 9.647-0.648 12.96-2.736 3.312-2.088 7.991-5.832 9.72-7.992 1.656-2.088 5.76-9.287 6.552-9.287 0.719 0 5.472-1.656 8.136 2.232z"/>
+   <path fill="#9e5e00" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-20.12 11.556-31.26 19.008-13.885 9.371-18.903 13.54-23.521 17.902-6.912 6.74-13.414 9.084-23.915 9.019-10.411-0.047-15.116-2.181-18.414-5.118-3.297-2.867-6.931-9.966-6.613-20.578 0.205-10.851 3.701-20.683 5.256-37.279 0.666-7.379 0.407-16.303 0.335-24.375-0.076-10.068-0.072-18.627 2.084-19.922 3.889-2.444 4.752-2.592 9.36-2.592 4.607 0 6.7 0.291 8.208 1.799 1.491 1.492 0.767 4.887 0.205 9.408-0.63 4.658 1.458 6.486 3.795 8.607 2.34 2.059 4.489 4.471 11.534 5.021 7.232 0.482 10.015-0.832 13.362-3.106 3.303-2.207 7.773-5.903 9.513-8.168 1.641-2.132 5.727-9.386 6.519-9.386 0.719 0 5.472-1.656 8.136 2.232z"/>
+   <path fill="#a36400" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-20.226 11.52-31.414 18.863-13.803 9.166-19.016 13.256-23.717 17.447-6.768 6.422-13.075 8.733-23.35 8.604-10.094-0.094-14.682-2.131-17.964-5.055-3.283-2.852-6.876-9.705-6.603-19.987 0.122-10.828 3.657-20.556 5.112-36.828 0.612-7.487 0.165-16.336 0.021-24.487-0.15-10.058-0.287-18.605 1.865-19.9 3.889-2.44 4.752-2.592 9.36-2.592 4.607 0 6.703 0.295 8.208 1.799 1.541 1.541 0.67 5.02 0.051 9.383-0.828 4.637 1.116 6.781 3.556 9.078 2.448 2.248 4.731 4.695 11.766 5.221 7.409 0.461 10.383-1.016 13.767-3.477 3.29-2.326 7.552-5.977 9.302-8.346 1.627-2.175 5.695-9.482 6.487-9.482 0.72-0.001 5.473-1.657 8.137 2.231z"/>
+   <path fill="#a86a00" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-20.329 11.484-31.568 18.72-13.721 8.961-19.127 12.972-23.911 16.989-6.624 6.105-12.737 8.384-22.785 8.189-9.777-0.141-14.245-2.08-17.514-4.99-3.27-2.836-6.822-9.445-6.591-19.396 0.038-10.807 3.613-20.43 4.968-36.378 0.558-7.597-0.076-16.368-0.292-24.599-0.228-10.047-0.504-18.584 1.645-19.879 3.889-2.438 4.752-2.592 9.36-2.592 4.607 0 6.707 0.299 8.208 1.799 1.591 1.593 0.573 5.152-0.104 9.357-1.025 4.615 0.774 7.077 3.319 9.551 2.556 2.434 4.972 4.918 11.995 5.418 7.585 0.439 10.75-1.199 14.17-3.849 3.279-2.444 7.333-6.048 9.093-8.521 1.613-2.219 5.663-9.58 6.455-9.58 0.719 0.001 5.472-1.655 8.136 2.233z"/>
+   <path fill="#ad7000" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-20.434 11.447-31.724 18.576-13.637 8.756-19.238 12.687-24.106 16.531-6.479 5.789-12.397 8.035-22.219 7.776-9.461-0.188-13.809-2.03-17.063-4.925-3.254-2.823-6.769-9.188-6.581-18.807-0.043-10.785 3.571-20.305 4.824-35.928 0.504-7.705-0.316-16.402-0.604-24.711-0.303-10.037-0.72-18.563 1.425-19.857 3.889-2.434 4.752-2.592 9.36-2.592 4.607 0 6.711 0.303 8.208 1.799 1.642 1.643 0.475 5.285-0.259 9.332-1.225 4.594 0.432 7.373 3.082 10.022 2.664 2.621 5.212 5.142 12.225 5.616 7.762 0.418 11.117-1.383 14.573-4.219 3.269-2.563 7.113-6.121 8.885-8.698 1.598-2.261 5.63-9.677 6.422-9.677 0.719 0.002 5.472-1.654 8.136 2.234z"/>
+   <path fill="#b27500" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-20.538 11.412-31.879 18.432-13.554 8.551-19.35 12.402-24.3 16.074-6.336 5.473-12.06 7.686-21.654 7.361-9.144-0.233-13.374-1.979-16.613-4.859-3.24-2.809-6.714-8.928-6.57-18.216-0.126-10.765 3.528-20.179 4.68-35.478 0.45-7.813-0.558-16.435-0.918-24.822-0.378-10.026-0.936-18.541 1.206-19.836 3.889-2.43 4.752-2.592 9.36-2.592 4.607 0 6.714 0.305 8.208 1.799 1.691 1.693 0.378 5.418-0.414 9.307-1.422 4.572 0.09 7.668 2.844 10.494 2.772 2.808 5.454 5.363 12.456 5.814 7.938 0.396 11.484-1.566 14.977-4.591 3.258-2.682 6.894-6.192 8.676-8.874 1.584-2.304 5.598-9.773 6.39-9.773 0.718 0 5.471-1.656 8.135 2.232z"/>
+   <path fill="#b77b00" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-20.643 11.376-32.033 18.288-13.472 8.345-19.461 12.118-24.494 15.616-6.192 5.156-11.723 7.338-21.089 6.949-8.827-0.281-12.938-1.93-16.164-4.795-3.226-2.795-6.66-8.67-6.56-17.627-0.209-10.742 3.485-20.052 4.536-35.027 0.396-7.92-0.799-16.467-1.23-24.934-0.454-10.015-1.152-18.52 0.985-19.814 3.889-2.426 4.752-2.592 9.36-2.592 4.607 0 6.718 0.31 8.208 1.799 1.743 1.744 0.281 5.553-0.569 9.281-1.62 4.551-0.252 7.963 2.607 10.967 2.88 2.994 5.694 5.586 12.686 6.012 8.115 0.373 11.852-1.75 15.379-4.961 3.248-2.801 6.676-6.264 8.469-9.051 1.568-2.348 5.564-9.871 6.356-9.871 0.72 0 5.473-1.656 8.137 2.232z"/>
+   <path fill="#bc8100" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-20.747 11.34-32.188 18.145-13.389 8.139-19.574 11.834-24.689 15.159-6.048 4.839-11.383 6.988-20.523 6.534-8.51-0.328-12.503-1.879-15.714-4.73-3.211-2.779-6.606-8.41-6.549-17.035-0.292-10.721 3.441-19.926 4.393-34.578 0.342-8.028-1.041-16.498-1.545-25.045-0.529-10.004-1.368-18.498 0.767-19.793 3.889-2.422 4.752-2.592 9.36-2.592 4.607 0 6.721 0.313 8.208 1.799 1.793 1.793 0.184 5.686-0.723 9.256-1.818 4.529-0.595 8.259 2.367 11.438 2.988 3.184 5.938 5.811 12.917 6.211 8.291 0.352 12.22-1.934 15.783-5.332 3.236-2.92 6.454-6.336 8.258-9.227 1.556-2.391 5.533-9.969 6.325-9.969 0.72-0.001 5.473-1.657 8.137 2.231z"/>
+   <path fill="#c18700" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-20.852 11.304-32.343 18-13.306 7.936-19.685 11.549-24.883 14.703-5.904 4.521-11.045 6.638-19.959 6.119-8.193-0.375-12.067-1.828-15.264-4.666-3.197-2.764-6.553-8.149-6.537-16.444-0.375-10.699 3.397-19.8 4.248-34.128 0.288-8.137-1.282-16.531-1.858-25.156-0.604-9.994-1.584-18.477 0.547-19.771 3.889-2.42 4.752-2.592 9.36-2.592 4.607 0 6.725 0.316 8.208 1.799 1.843 1.845 0.087 5.818-0.878 9.231-2.017 4.507-0.937 8.554 2.131 11.909 3.096 3.369 6.178 6.033 13.146 6.408 8.468 0.33 12.587-2.117 16.187-5.703 3.225-3.038 6.235-6.408 8.049-9.402 1.541-2.436 5.501-10.066 6.293-10.066 0.72-0.001 5.473-1.657 8.137 2.231z"/>
+   <path fill="#c68c00" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-20.955 11.268-32.498 17.855-13.223 7.73-19.796 11.266-25.077 14.246-5.761 4.204-10.706 6.289-19.394 5.707-7.877-0.423-11.631-1.779-14.813-4.602-3.183-2.751-6.498-7.891-6.527-15.855-0.457-10.677 3.355-19.674 4.104-33.678 0.234-8.244-1.521-16.563-2.17-25.268-0.681-9.983-1.8-18.455 0.327-19.75 3.889-2.416 4.752-2.592 9.36-2.592 4.607 0 6.729 0.32 8.208 1.799 1.894 1.895-0.011 5.951-1.033 9.207-2.214 4.484-1.278 8.848 1.895 12.379 3.203 3.558 6.418 6.258 13.377 6.607 8.644 0.309 12.952-2.301 16.589-6.074 3.215-3.156 6.016-6.479 7.841-9.58 1.526-2.477 5.468-10.162 6.26-10.162 0.718 0.001 5.471-1.655 8.135 2.233z"/>
+   <path fill="#cc9200" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-21.061 11.232-32.652 17.712-13.141 7.524-19.908 10.979-25.272 13.788-5.616 3.888-10.368 5.939-18.828 5.292-7.56-0.468-11.195-1.728-14.363-4.536-3.168-2.736-6.444-7.632-6.517-15.264-0.54-10.656 3.313-19.549 3.96-33.229 0.181-8.352-1.764-16.596-2.483-25.38-0.757-9.972-2.017-18.433 0.107-19.728 3.889-2.412 4.752-2.592 9.36-2.592 4.607 0 6.731 0.323 8.208 1.799 1.944 1.945-0.108 6.084-1.188 9.181-2.412 4.464-1.62 9.144 1.656 12.853 3.313 3.744 6.66 6.479 13.608 6.803 8.819 0.289 13.319-2.483 16.991-6.443 3.204-3.275 5.797-6.553 7.633-9.756 1.512-2.52 5.436-10.26 6.228-10.26 0.719 0 5.472-1.656 8.136 2.232z"/>
+   <path fill="#d19800" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-21.164 11.195-32.808 17.568-13.057 7.318-20.019 10.695-25.466 13.33-5.473 3.571-10.03 5.592-18.263 4.879-7.243-0.516-10.761-1.678-13.914-4.472-3.153-2.722-6.391-7.372-6.506-14.674-0.623-10.634 3.27-19.422 3.816-32.778 0.126-8.459-2.005-16.627-2.797-25.49-0.832-9.961-2.232-18.412-0.112-19.707 3.889-2.408 4.752-2.592 9.36-2.592 4.607 0 6.736 0.328 8.208 1.799 1.995 1.996-0.205 6.219-1.343 9.156-2.61 4.442-1.962 9.438 1.419 13.323 3.42 3.931 6.9 6.703 13.838 7.002 8.997 0.267 13.687-2.668 17.395-6.815 3.194-3.395 5.577-6.623 7.424-9.932 1.497-2.564 5.403-10.357 6.195-10.357 0.721 0 5.474-1.656 8.138 2.232z"/>
+   <path fill="#d69e00" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-21.27 11.16-32.962 17.424-12.975 7.114-20.132 10.412-25.661 12.874-5.327 3.254-9.69 5.242-17.697 4.464-6.927-0.563-10.325-1.627-13.464-4.406-3.14-2.707-6.337-7.113-6.494-14.084-0.706-10.611 3.225-19.295 3.672-32.328 0.072-8.567-2.247-16.66-3.111-25.603-0.907-9.95-2.448-18.39-0.331-19.685 3.889-2.404 4.752-2.592 9.36-2.592 4.607 0 6.739 0.332 8.208 1.799 2.045 2.045-0.302 6.352-1.497 9.131-2.808 4.421-2.304 9.734 1.18 13.795 3.528 4.119 7.144 6.927 14.069 7.199 9.173 0.246 14.055-2.851 17.799-7.185 3.182-3.514 5.356-6.696 7.214-10.108 1.483-2.607 5.371-10.455 6.163-10.455 0.719 0 5.472-1.656 8.136 2.232z"/>
+   <path fill="#dba300" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-21.373 11.124-33.116 17.279-12.893 6.91-20.243 10.127-25.855 12.418-5.184 2.937-9.353 4.892-17.133 4.05-6.609-0.609-9.889-1.577-13.014-4.343-3.125-2.692-6.282-6.854-6.483-13.492-0.789-10.592 3.182-19.17 3.528-31.879 0.018-8.676-2.488-16.692-3.425-25.713-0.982-9.94-2.664-18.369-0.551-19.664 3.889-2.401 4.752-2.592 9.36-2.592 4.607 0 6.743 0.334 8.208 1.799 2.095 2.097-0.399 6.484-1.652 9.105-3.006 4.398-2.646 10.029 0.943 14.268 3.636 4.305 7.384 7.148 14.299 7.397 9.349 0.224 14.422-3.034 18.202-7.558 3.171-3.631 5.137-6.768 7.005-10.284 1.469-2.649 5.339-10.552 6.131-10.552 0.72 0.001 5.473-1.655 8.137 2.233z"/>
+   <path fill="#e0a900" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-21.478 11.088-33.271 17.136-12.81 6.704-20.354 9.843-26.05 11.96-5.04 2.62-9.015 4.543-16.567 3.637-6.293-0.656-9.453-1.527-12.563-4.277-3.11-2.68-6.229-6.596-6.474-12.903-0.871-10.569 3.141-19.044 3.384-31.428-0.035-8.784-2.728-16.726-3.735-25.826-1.06-9.929-2.88-18.347-0.771-19.642 3.889-2.397 4.752-2.592 9.36-2.592 4.607 0 6.747 0.338 8.208 1.799 2.146 2.146-0.497 6.617-1.808 9.08-3.203 4.377-2.987 10.324 0.706 14.738 3.744 4.493 7.624 7.373 14.529 7.596 9.526 0.203 14.789-3.217 18.605-7.926 3.161-3.752 4.918-6.841 6.797-10.463 1.454-2.693 5.306-10.648 6.098-10.648 0.719-0.001 5.472-1.657 8.136 2.231z"/>
+   <path fill="#e5af00" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-21.582 11.052-33.427 16.992-12.726 6.498-20.466 9.558-26.244 11.502-4.896 2.304-8.676 4.193-16.002 3.222-5.976-0.702-9.018-1.476-12.114-4.212-3.096-2.664-6.174-6.336-6.462-12.313-0.953-10.547 3.097-18.918 3.24-30.978-0.09-8.892-2.97-16.758-4.05-25.938-1.134-9.918-3.096-18.324-0.99-19.619 3.889-2.395 4.752-2.592 9.36-2.592 4.607 0 6.75 0.342 8.208 1.799 2.196 2.197-0.594 6.75-1.962 9.055-3.402 4.355-3.33 10.619 0.468 15.21 3.852 4.681 7.866 7.597 14.76 7.794 9.702 0.18 15.156-3.402 19.008-8.298 3.15-3.87 4.698-6.912 6.589-10.638 1.439-2.736 5.273-10.746 6.065-10.746 0.72 0 5.473-1.656 8.137 2.232z"/>
+   <path fill="#eab500" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-21.687 11.016-33.582 16.848-12.643 6.293-20.576 9.274-26.438 11.045-4.752 1.987-8.338 3.846-15.438 2.809-5.658-0.75-8.582-1.426-11.664-4.147-3.08-2.649-6.119-6.077-6.45-11.722-1.037-10.526 3.053-18.792 3.096-30.528-0.144-9-3.211-16.79-4.363-26.049-1.21-9.907-3.312-18.304-1.21-19.599 3.889-2.391 4.752-2.592 9.36-2.592 4.607 0 6.754 0.346 8.208 1.799 2.247 2.248-0.691 6.885-2.117 9.029-3.6 4.336-3.672 10.916 0.231 15.682 3.96 4.867 8.106 7.82 14.989 7.992 9.879 0.158 15.523-3.586 19.411-8.668 3.141-3.99 4.479-6.984 6.38-10.814 1.426-2.78 5.241-10.844 6.033-10.844 0.721-0.001 5.474-1.657 8.138 2.231z"/>
+   <path fill="#efba00" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-21.791 10.98-33.735 16.703-12.562 6.089-20.69 8.99-26.633 10.589-4.608 1.67-7.999 3.496-14.872 2.394-5.343-0.796-8.147-1.375-11.215-4.082-3.066-2.636-6.065-5.818-6.439-11.132-1.12-10.504 3.009-18.666 2.952-30.077-0.198-9.109-3.453-16.822-4.677-26.162-1.285-9.896-3.528-18.281-1.43-19.576 3.889-2.387 4.752-2.592 9.36-2.592 4.607 0 6.757 0.35 8.208 1.799 2.297 2.297-0.788 7.018-2.271 9.004-3.798 4.314-4.014 11.211-0.008 16.154 4.068 5.055 8.35 8.043 15.221 8.189 10.056 0.137 15.892-3.77 19.815-9.039 3.128-4.107 4.258-7.057 6.17-10.99 1.411-2.824 5.209-10.941 6.001-10.941 0.72-0.001 5.473-1.657 8.137 2.231z"/>
+   <path fill="#f4c000" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-21.896 10.943-33.891 16.561-12.478 5.883-20.801 8.704-26.827 10.131-4.464 1.353-7.661 3.146-14.307 1.979-5.025-0.843-7.711-1.325-10.765-4.019-3.053-2.621-6.012-5.558-6.429-10.541-1.203-10.482 2.966-18.539 2.809-29.627-0.253-9.217-3.694-16.855-4.99-26.272-1.361-9.886-3.744-18.261-1.649-19.556 3.889-2.383 4.752-2.592 9.36-2.592 4.607 0 6.761 0.353 8.208 1.799 2.347 2.349-0.885 7.15-2.426 8.979-3.996 4.291-4.356 11.505-0.245 16.625 4.176 5.241 8.59 8.265 15.451 8.388 10.23 0.115 16.258-3.953 20.218-9.41 3.117-4.227 4.039-7.129 5.961-11.168 1.396-2.865 5.177-11.037 5.969-11.037 0.72 0 5.473-1.656 8.137 2.232z"/>
+   <path fill="#f9c600" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-21.999 10.908-34.046 16.416-12.395 5.678-20.912 8.421-27.021 9.674-4.32 1.036-7.322 2.797-13.741 1.566-4.709-0.891-7.275-1.275-10.314-3.953-3.037-2.607-5.958-5.299-6.419-9.951-1.284-10.461 2.925-18.414 2.664-29.178-0.306-9.324-3.934-16.887-5.302-26.385-1.437-9.875-3.96-18.238-1.869-19.533 3.889-2.379 4.752-2.592 9.36-2.592 4.607 0 6.765 0.356 8.208 1.799 2.397 2.398-0.983 7.283-2.581 8.955-4.194 4.269-4.698 11.799-0.482 17.096 4.284 5.429 8.83 8.488 15.682 8.586 10.407 0.094 16.625-4.137 20.621-9.781 3.106-4.345 3.819-7.199 5.753-11.344 1.382-2.909 5.144-11.135 5.936-11.135 0.718 0 5.471-1.656 8.135 2.232z"/>
+   <path fill="#fc0" d="m303.631 262.529c4.464 6.479-0.145 14.904 3.096 20.089 5.328 8.496 16.056 17.063 20.16 19.439 2.952 1.8 7.128 3.527 6.983 8.783-0.216 5.977-3.168 7.561-4.823 9.217-3.313 3.313-22.104 10.872-34.2 16.271-12.313 5.473-21.024 8.137-27.217 9.217-4.176 0.72-6.983 2.447-13.176 1.151-4.392-0.937-6.84-1.224-9.864-3.888-3.023-2.592-5.903-5.04-6.407-9.359-1.368-10.441 2.88-18.289 2.52-28.729-0.36-9.432-4.176-16.92-5.616-26.496-1.512-9.864-4.176-18.217-2.088-19.512 3.889-2.377 4.752-2.592 9.36-2.592 4.607 0 6.768 0.359 8.208 1.799 2.448 2.449-1.08 7.416-2.736 8.929-4.392 4.248-5.04 12.096-0.72 17.567 4.392 5.617 9.072 8.713 15.912 8.785 10.584 0.071 16.992-4.32 21.023-10.152 3.097-4.465 3.601-7.272 5.544-11.521 1.368-2.952 5.112-11.231 5.904-11.231 0.72 0.001 5.473-1.655 8.137 2.233z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#fc0" d="m236.263 275.762c-0.709-0.258-3.932-15.209-2.191-16.239 3.351-1.997 4.253-2.319 8.377-2.319s6.057 0.322 7.346 1.61c2.126 2.127-1.159 6.702-2.448 7.991-3.738 3.673-10.375 9.215-11.084 8.957z"/>
+   <path fill="#ffcc02" d="m236.492 275.286c-0.77-0.326-4.102-14.719-2.368-15.742 3.344-1.992 4.278-2.211 8.322-2.211 4.124 0 5.976 0.269 7.282 1.602 2.105 2.136-1.119 6.572-2.398 7.852-3.727 3.663-10.081 8.811-10.838 8.499z"/>
+   <path fill="#ffcc05" d="m236.721 274.809c-0.832-0.393-4.273-14.229-2.547-15.247 3.339-1.983 4.306-2.101 8.269-2.101 4.124 0 5.896 0.213 7.217 1.592 2.087 2.146-1.076 6.443-2.346 7.714-3.718 3.653-9.788 8.409-10.593 8.042z"/>
+   <path fill="#ffcc07" d="m236.949 274.333c-0.892-0.461-4.443-13.74-2.722-14.75 3.331-1.979 4.33-1.992 8.213-1.992 4.124 0 5.814 0.158 7.151 1.582 2.068 2.156-1.033 6.316-2.294 7.574-3.707 3.644-9.494 8.007-10.348 7.586z"/>
+   <path fill="#ffcd0a" d="m237.178 273.855c-0.954-0.528-4.614-13.249-2.9-14.254 3.326-1.972 4.355-1.882 8.158-1.882 4.124 0 5.734 0.104 7.089 1.572 2.048 2.166-0.993 6.187-2.243 7.437-3.699 3.634-9.202 7.605-10.104 7.127z"/>
+   <path fill="#ffcd0c" d="m237.407 273.377c-1.015-0.596-4.785-12.758-3.077-13.758 3.319-1.965 4.382-1.771 8.104-1.771 4.124 0 5.653 0.049 7.023 1.563 2.029 2.176-0.951 6.057-2.19 7.299-3.69 3.623-8.91 7.201-9.86 6.667z"/>
+   <path fill="#ffcd0f" d="m237.636 272.901c-1.077-0.662-4.956-12.27-3.256-13.261 3.313-1.959 4.408-1.663 8.05-1.663 4.124 0 5.573-0.006 6.959 1.553 2.01 2.186-0.908 5.93-2.14 7.159-3.679 3.614-8.615 6.8-9.613 6.212z"/>
+   <path fill="#ffcd11" d="m237.864 272.424c-1.137-0.731-5.126-11.779-3.431-12.766 3.306-1.951 4.433-1.553 7.994-1.553 4.123 0 5.492-0.061 6.895 1.543 1.991 2.193-0.867 5.801-2.089 7.021-3.669 3.606-8.321 6.397-9.369 5.755z"/>
+   <path fill="#ffce14" d="m238.093 271.948c-1.197-0.799-5.297-11.289-3.607-12.27 3.299-1.946 4.459-1.443 7.938-1.443 4.124 0 5.412-0.115 6.83 1.533 1.973 2.204-0.824 5.671-2.037 6.883-3.659 3.596-8.028 5.993-9.124 5.297z"/>
+   <path fill="#ffce16" d="m238.322 271.471c-1.26-0.867-5.468-10.801-3.786-11.773 3.293-1.939 4.485-1.334 7.884-1.334 4.124 0 5.332-0.171 6.767 1.524 1.953 2.213-0.783 5.542-1.985 6.743-3.651 3.586-7.736 5.591-8.88 4.84z"/>
+   <path fill="#ffce19" d="m238.551 270.995c-1.32-0.935-5.639-10.312-3.963-11.277 3.286-1.934 4.511-1.225 7.829-1.225 4.124 0 5.252-0.226 6.702 1.514 1.934 2.224-0.741 5.414-1.934 6.605-3.64 3.576-7.442 5.187-8.634 4.383z"/>
+   <path fill="#ffce1c" d="m238.779 270.517c-1.382-1.002-5.809-9.821-4.14-10.781 3.279-1.926 4.535-1.114 7.774-1.114 4.124 0 5.171-0.279 6.637 1.504 1.914 2.233-0.698 5.285-1.882 6.467-3.63 3.566-7.148 4.784-8.389 3.924z"/>
+   <path fill="#ffcf1e" d="m239.008 270.04c-1.442-1.068-5.979-9.33-4.316-10.283 3.272-1.922 4.562-1.006 7.72-1.006 4.124 0 5.09-0.334 6.572 1.494 1.895 2.244-0.657 5.156-1.83 6.328-3.622 3.556-6.857 4.383-8.146 3.467z"/>
+   <path fill="#ffcf21" d="m239.237 269.563c-1.505-1.137-6.151-8.841-4.495-9.788 3.267-1.914 4.588-0.896 7.666-0.896 4.124 0 5.009-0.389 6.508 1.486 1.875 2.252-0.616 5.025-1.778 6.188-3.613 3.548-6.564 3.981-7.901 3.01z"/>
+   <path fill="#ffcf23" d="m239.466 269.086c-1.565-1.205-6.321-8.352-4.672-9.293 3.262-1.906 4.613-0.785 7.61-0.785 4.124 0 4.93-0.444 6.444 1.476 1.855 2.261-0.573 4.897-1.728 6.052-3.601 3.537-6.269 3.575-7.654 2.55z"/>
+   <path fill="#ffcf26" d="m239.694 268.61c-1.627-1.273-6.492-7.861-4.849-8.796 3.255-1.901 4.64-0.677 7.556-0.677 4.124 0 4.849-0.499 6.379 1.466 1.837 2.271-0.531 4.769-1.675 5.912-3.593 3.528-5.977 3.174-7.411 2.095z"/>
+   <path fill="#ffd028" d="m239.923 268.133c-1.688-1.34-6.663-7.373-5.025-8.301 3.248-1.895 4.665-0.566 7.501-0.566 4.124 0 4.768-0.555 6.314 1.456 1.817 2.28-0.489 4.64-1.624 5.774-3.583 3.519-5.684 2.771-7.166 1.637z"/>
+   <path fill="#ffd02b" d="m240.152 267.657c-1.749-1.408-6.834-6.883-5.203-7.805 3.241-1.889 4.69-0.457 7.446-0.457 4.124 0 4.687-0.609 6.25 1.447 1.798 2.289-0.448 4.51-1.573 5.635-3.572 3.509-5.39 2.367-6.92 1.18z"/>
+   <path fill="#ffd02d" d="m240.381 267.178c-1.811-1.475-7.005-6.391-5.381-7.307 3.235-1.881 4.717-0.348 7.393-0.348 4.124 0 4.606-0.664 6.185 1.438 1.779 2.299-0.405 4.381-1.521 5.496-3.564 3.501-5.098 1.965-6.676 0.721z"/>
+   <path fill="#ffd030" d="m240.609 266.702c-1.871-1.543-7.175-5.902-5.557-6.811 3.228-1.875 4.741-0.238 7.336-0.238 4.124 0 4.526-0.719 6.122 1.428 1.759 2.31-0.364 4.252-1.471 5.357-3.552 3.49-4.803 1.562-6.43 0.264z"/>
+   <path fill="#ffd133" d="m240.838 266.225c-1.933-1.611-7.346-5.413-5.734-6.314 3.222-1.869 4.768-0.129 7.281-0.129 4.124 0 4.446-0.773 6.058 1.418 1.74 2.318-0.322 4.123-1.418 5.219-3.545 3.48-4.512 1.16-6.187-0.194z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#fc0" d="m302.769 263.374c3.742 5.461-0.062 12.76 2.638 17.117-6.809-6.258-9.938-8.834-19.324 0.367 2.577-3.742 3.129-6.257 4.725-9.814 1.104-2.455 4.354-9.57 5.029-9.57 0.613-0.001 4.724-1.35 6.932 1.9z"/>
+   <path fill="#ffcc02" d="m302.73 263.413c3.655 5.334 0.035 12.601 2.578 16.723-6.668-6.098-9.729-8.666-18.908 0.322 2.421-3.527 3.025-6.094 4.605-9.592 1.122-2.462 4.243-9.302 4.951-9.311 0.628-0.008 4.617-1.318 6.774 1.858z"/>
+   <path fill="#ffcc05" d="m302.691 263.45c3.568 5.209 0.132 12.441 2.517 16.332-6.526-5.938-9.519-8.5-18.492 0.277 2.268-3.314 2.924-5.934 4.488-9.372 1.141-2.468 4.132-9.032 4.873-9.052 0.641-0.013 4.508-1.284 6.614 1.815z"/>
+   <path fill="#ffcc07" d="m302.652 263.487c3.48 5.086 0.229 12.282 2.457 15.939-6.386-5.777-9.311-8.332-18.076 0.232 2.111-3.1 2.819-5.771 4.369-9.15 1.158-2.475 4.021-8.762 4.795-8.791 0.655-0.019 4.399-1.254 6.455 1.77z"/>
+   <path fill="#ffcd0a" d="m302.614 263.524c3.393 4.96 0.323 12.123 2.396 15.549-6.245-5.617-9.102-8.164-17.66 0.188 1.955-2.887 2.716-5.611 4.251-8.93 1.176-2.481 3.91-8.494 4.716-8.533 0.67-0.027 4.291-1.219 6.297 1.726z"/>
+   <path fill="#ffcd0c" d="m302.575 263.562c3.306 4.835 0.419 11.964 2.335 15.155-6.104-5.457-8.891-7.996-17.244 0.143 1.8-2.673 2.613-5.449 4.133-8.707 1.194-2.488 3.8-8.225 4.638-8.273 0.684-0.036 4.182-1.189 6.138 1.682z"/>
+   <path fill="#ffcd0f" d="m302.536 263.599c3.219 4.71 0.517 11.805 2.275 14.765-5.963-5.299-8.683-7.83-16.828 0.098 1.644-2.461 2.51-5.289 4.015-8.486 1.212-2.496 3.688-7.956 4.559-8.016 0.698-0.04 4.075-1.155 5.979 1.639z"/>
+   <path fill="#ffcd11" d="m302.497 263.637c3.131 4.585 0.612 11.645 2.216 14.371-5.822-5.137-8.474-7.661-16.413 0.053 1.489-2.245 2.406-5.125 3.896-8.264 1.229-2.504 3.576-7.688 4.479-7.756 0.714-0.046 3.968-1.123 5.822 1.596z"/>
+   <path fill="#ffce14" d="m302.458 263.674c3.044 4.459 0.708 11.486 2.154 13.979-5.681-4.978-8.263-7.493-15.996 0.009 1.334-2.033 2.303-4.965 3.779-8.043 1.247-2.511 3.464-7.418 4.4-7.498 0.728-0.052 3.859-1.089 5.663 1.553z"/>
+   <path fill="#ffce16" d="m302.42 263.711c2.956 4.336 0.804 11.328 2.094 13.588-5.54-4.817-8.055-7.326-15.58-0.036 1.178-1.819 2.199-4.804 3.659-7.822 1.267-2.517 3.354-7.149 4.323-7.237 0.741-0.061 3.75-1.058 5.504 1.507z"/>
+   <path fill="#ffce19" d="m302.381 263.749c2.868 4.211 0.9 11.168 2.033 13.196-5.398-4.657-7.845-7.159-15.164-0.081 1.022-1.605 2.097-4.642 3.542-7.601 1.283-2.524 3.241-6.88 4.244-6.979 0.755-0.067 3.642-1.026 5.345 1.465z"/>
+   <path fill="#ffce1c" d="m302.342 263.788c2.78 4.084 0.997 11.008 1.973 12.803-5.258-4.498-7.635-6.991-14.748-0.127 0.867-1.391 1.994-4.479 3.424-7.379 1.302-2.531 3.13-6.61 4.166-6.719 0.768-0.074 3.532-0.992 5.185 1.422z"/>
+   <path fill="#ffcf1e" d="m302.302 263.825c2.693 3.959 1.093 10.85 1.913 12.411-5.117-4.338-7.427-6.825-14.333-0.172 0.713-1.177 1.891-4.317 3.307-7.157 1.318-2.537 3.018-6.342 4.086-6.461 0.784-0.08 3.426-0.959 5.027 1.379z"/>
+   <path fill="#ffcf21" d="m302.263 263.862c2.606 3.834 1.188 10.689 1.853 12.02-4.976-4.178-7.217-6.657-13.916-0.217 0.556-0.963 1.786-4.156 3.188-6.936 1.337-2.545 2.906-6.072 4.008-6.202 0.797-0.086 3.318-0.927 4.867 1.335z"/>
+   <path fill="#ffcf23" d="m302.225 263.899c2.519 3.71 1.285 10.531 1.791 11.628-4.835-4.019-7.008-6.489-13.5-0.262 0.4-0.75 1.684-3.994 3.068-6.714 1.356-2.553 2.797-5.805 3.931-5.943 0.813-0.093 3.209-0.895 4.71 1.291z"/>
+   <path fill="#ffcf26" d="m302.186 263.937c2.431 3.584 1.381 10.371 1.73 11.235-4.693-3.857-6.798-6.322-13.084-0.307 0.245-0.535 1.58-3.832 2.951-6.492 1.373-2.56 2.686-5.535 3.852-5.685 0.828-0.1 3.101-0.861 4.551 1.249z"/>
+   <path fill="#ffd028" d="m302.147 263.974c2.344 3.46 1.477 10.213 1.671 10.845-4.553-3.699-6.589-6.156-12.668-0.354 0.089-0.321 1.477-3.67 2.832-6.271 1.392-2.565 2.574-5.267 3.772-5.425 0.842-0.104 2.994-0.828 4.393 1.205z"/>
+   <path fill="#ffd02b" d="m302.108 264.012c2.257 3.334 1.573 10.053 1.61 10.451-4.412-3.537-6.38-5.987-12.253-0.396-0.064-0.109 1.374-3.51 2.716-6.05 1.408-2.573 2.462-4.997 3.693-5.166 0.856-0.112 2.886-0.796 4.234 1.161z"/>
+   <path fill="#ffd02d" d="m302.069 264.049c2.17 3.209 1.67 9.894 1.55 10.061-4.271-3.379-6.17-5.82-11.836-0.441-0.221 0.104 1.271-3.35 2.596-5.83 1.428-2.58 2.352-4.728 3.615-4.906 0.87-0.12 2.777-0.765 4.075 1.116z"/>
+   <path fill="#ffd030" d="m302.03 264.086c2.082 3.084 1.767 9.736 1.49 9.668-4.131-3.219-5.961-5.652-11.42-0.486-0.377 0.318 1.167-3.188 2.478-5.607 1.445-2.586 2.239-4.459 3.536-4.647 0.884-0.127 2.669-0.732 3.916 1.072z"/>
+   <path fill="#ffd133" d="m301.991 264.124c1.995 2.959 1.862 9.576 1.43 9.277-3.989-3.059-5.752-5.486-11.005-0.531-0.532 0.531 1.064-3.027 2.36-5.387 1.463-2.594 2.128-4.189 3.458-4.389 0.899-0.133 2.561-0.699 3.757 1.03z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#fc0" d="m305.862 283.481c5.977 7.848 17.064 16.271 21.024 18.576 2.88 1.656 7.056 3.6 6.983 8.783-0.144 5.904-3.168 7.561-4.823 9.217-3.313 3.313-22.177 10.943-34.2 16.271-12.24 5.4-21.097 8.209-27.217 9.217-4.104 0.647-7.056 2.375-13.176 1.151-4.32-0.864-6.912-1.296-9.864-3.888-2.951-2.52-5.976-5.184-6.407-9.359-1.225-10.369 3.672-16.921 8.424-25.921 3.888-7.2 11.735-8.64 16.632-7.991 17.568 2.375 16.416-8.641 21.24-13.465 4.464-4.463 17.208-8.064 21.384-2.591z"/>
+   <path fill="#ffcc02" d="m305.81 283.553c5.962 7.83 17.024 16.234 20.975 18.533 2.873 1.652 7.039 3.592 6.969 8.764-0.145 5.891-3.161 7.542-4.813 9.195-3.304 3.304-22.34 10.992-34.24 16.088-12.259 5.176-20.647 7.873-26.802 8.959-4.077 0.684-7.156 2.394-13.258 1.177-4.304-0.854-6.767-1.231-9.707-3.812-2.939-2.51-5.756-4.961-6.185-9.117-1.211-10.34 3.365-16.657 8.044-25.65 3.89-7.375 11.791-8.434 16.665-7.777 17.514 2.414 16.206-8.959 21.02-13.772 4.452-4.454 17.166-8.047 21.332-2.588z"/>
+   <path fill="#ffcc05" d="m305.76 283.627c5.946 7.812 16.982 16.195 20.925 18.488 2.866 1.648 7.022 3.584 6.951 8.743-0.144 5.876-3.153 7.524-4.801 9.173-3.298 3.297-22.506 11.043-34.28 15.907-12.279 4.949-20.201 7.538-26.389 8.699-4.051 0.721-7.256 2.413-13.341 1.202-4.286-0.846-6.619-1.168-9.55-3.733-2.924-2.501-5.536-4.741-5.959-8.877-1.198-10.312 3.058-16.394 7.664-25.379 3.89-7.552 11.845-8.229 16.698-7.563 17.458 2.453 15.995-9.279 20.797-14.08 4.443-4.443 17.127-8.026 21.285-2.58z"/>
+   <path fill="#ffcc07" d="m305.707 283.702c5.935 7.791 16.943 16.156 20.876 18.444 2.859 1.644 7.007 3.574 6.935 8.722-0.144 5.862-3.146 7.508-4.79 9.151-3.288 3.289-22.668 11.093-34.319 15.726-12.298 4.723-19.753 7.202-25.974 8.44-4.024 0.756-7.357 2.431-13.423 1.226-4.27-0.836-6.473-1.101-9.394-3.654-2.911-2.492-5.317-4.52-5.735-8.635-1.185-10.285 2.75-16.133 7.284-25.109 3.892-7.727 11.9-8.023 16.731-7.35 17.402 2.494 15.785-9.599 20.575-14.389 4.433-4.432 17.087-8.007 21.234-2.572z"/>
+   <path fill="#ffcd0a" d="m305.655 283.774c5.92 7.773 16.904 16.119 20.826 18.4 2.854 1.642 6.99 3.566 6.919 8.703-0.143 5.848-3.138 7.488-4.779 9.129-3.28 3.281-22.832 11.143-34.358 15.543-12.317 4.498-19.307 6.867-25.561 8.182-3.997 0.793-7.457 2.45-13.506 1.251-4.252-0.828-6.325-1.036-9.236-3.577-2.896-2.482-5.096-4.298-5.51-8.393-1.172-10.258 2.443-15.869 6.904-24.84 3.892-7.901 11.955-7.818 16.763-7.135 17.349 2.532 15.576-9.918 20.355-14.697 4.422-4.422 17.046-7.987 21.183-2.566z"/>
+   <path fill="#ffcd0c" d="m305.603 283.847c5.906 7.756 16.864 16.081 20.777 18.358 2.846 1.635 6.973 3.557 6.901 8.68-0.142 5.835-3.131 7.472-4.767 9.107-3.273 3.273-22.997 11.193-34.399 15.361-12.337 4.273-18.858 6.533-25.146 7.924-3.971 0.829-7.557 2.469-13.588 1.276-4.234-0.82-6.179-0.972-9.078-3.5-2.884-2.474-4.878-4.076-5.287-8.152-1.158-10.229 2.137-15.606 6.523-24.569 3.895-8.076 12.01-7.611 16.797-6.92 17.293 2.571 15.366-10.236 20.134-15.004 4.412-4.411 17.006-7.969 21.133-2.561z"/>
+   <path fill="#ffcd0f" d="m305.552 283.92c5.892 7.736 16.824 16.043 20.728 18.313 2.839 1.634 6.957 3.55 6.886 8.66-0.142 5.821-3.124 7.454-4.756 9.086-3.266 3.267-23.161 11.243-34.438 15.179-12.356 4.047-18.411 6.198-24.733 7.666-3.943 0.865-7.656 2.486-13.67 1.301-4.218-0.812-6.032-0.908-8.922-3.422-2.869-2.465-4.656-3.855-5.063-7.91-1.145-10.203 1.83-15.344 6.145-24.299 3.895-8.252 12.064-7.408 16.83-6.707 17.237 2.61 15.154-10.557 19.912-15.313 4.399-4.399 16.963-7.949 21.081-2.554z"/>
+   <path fill="#ffcd11" d="m305.501 283.993c5.877 7.719 16.782 16.004 20.678 18.271 2.833 1.628 6.939 3.54 6.869 8.639-0.143 5.807-3.116 7.436-4.745 9.064-3.257 3.258-23.324 11.293-34.479 14.996-12.375 3.822-17.963 5.863-24.319 7.408-3.917 0.9-7.757 2.504-13.752 1.324-4.2-0.802-5.886-0.842-8.765-3.344-2.856-2.454-4.438-3.633-4.838-7.669-1.132-10.173 1.521-15.081 5.764-24.029 3.896-8.426 12.119-7.2 16.863-6.491 17.183 2.649 14.945-10.875 19.689-15.621 4.391-4.389 16.926-7.93 21.035-2.548z"/>
+   <path fill="#ffce14" d="m305.448 284.066c5.863 7.701 16.743 15.966 20.629 18.228 2.826 1.625 6.924 3.531 6.853 8.619-0.142 5.793-3.108 7.418-4.733 9.043-3.25 3.25-23.489 11.342-34.518 14.813-12.396 3.598-17.517 5.529-23.905 7.148-3.891 0.938-7.857 2.524-13.834 1.351-4.185-0.793-5.74-0.776-8.609-3.267-2.841-2.444-4.217-3.412-4.613-7.426-1.118-10.146 1.216-14.818 5.385-23.76 3.896-8.602 12.174-6.996 16.896-6.277 17.128 2.688 14.735-11.195 19.468-15.929 4.378-4.38 16.883-7.911 20.981-2.543z"/>
+   <path fill="#ffce16" d="m305.396 284.139c5.85 7.682 16.703 15.928 20.579 18.184 2.82 1.62 6.907 3.523 6.837 8.598-0.141 5.779-3.101 7.4-4.722 9.021-3.242 3.242-23.653 11.393-34.559 14.631-12.414 3.372-17.068 5.194-23.491 6.891-3.862 0.975-7.957 2.543-13.917 1.375-4.167-0.783-5.592-0.713-8.451-3.188-2.827-2.437-3.997-3.19-4.389-7.187-1.105-10.117 0.908-14.555 5.004-23.487 3.898-8.776 12.229-6.79 16.928-6.063 17.074 2.728 14.525-11.515 19.248-16.236 4.37-4.371 16.845-7.894 20.933-2.539z"/>
+   <path fill="#ffce19" d="m305.344 284.211c5.836 7.664 16.663 15.891 20.529 18.141 2.813 1.617 6.892 3.516 6.82 8.578-0.14 5.765-3.093 7.382-4.71 8.999-3.235 3.233-23.817 11.442-34.598 14.448-12.434 3.146-16.621 4.859-23.077 6.633-3.837 1.01-8.058 2.561-13.999 1.4-4.15-0.775-5.446-0.648-8.295-3.111-2.814-2.426-3.777-2.969-4.164-6.944-1.094-10.09 0.601-14.293 4.624-23.22 3.898-8.951 12.282-6.584 16.961-5.848 17.019 2.767 14.314-11.834 19.025-16.545 4.361-4.359 16.806-7.872 20.884-2.531z"/>
+   <path fill="#ffce1c" d="m305.292 284.286c5.822 7.646 16.623 15.852 20.481 18.096 2.806 1.613 6.874 3.507 6.804 8.558-0.141 5.751-3.086 7.364-4.699 8.978-3.227 3.227-23.981 11.492-34.638 14.267-12.453 2.921-16.173 4.524-22.663 6.374-3.81 1.046-8.158 2.578-14.082 1.424-4.133-0.766-5.299-0.583-8.137-3.033-2.801-2.416-3.558-2.748-3.94-6.703-1.08-10.062 0.293-14.029 4.244-22.947 3.9-9.127 12.338-6.379 16.994-5.635 16.964 2.805 14.105-12.152 18.805-16.853 4.348-4.351 16.763-7.856 20.831-2.526z"/>
+   <path fill="#ffcf1e" d="m305.241 284.358c5.808 7.627 16.582 15.814 20.432 18.053 2.799 1.609 6.856 3.498 6.787 8.536-0.141 5.738-3.079 7.347-4.688 8.957-3.219 3.218-24.145 11.541-34.677 14.084-12.473 2.695-15.727 4.188-22.25 6.115-3.783 1.083-8.258 2.599-14.163 1.448-4.116-0.756-5.153-0.518-7.981-2.954-2.786-2.408-3.337-2.526-3.716-6.462-1.066-10.034-0.013-13.766 3.864-22.678 3.901-9.303 12.393-6.172 17.027-5.42 16.908 2.844 13.896-12.473 18.583-17.16 4.338-4.337 16.723-7.835 20.782-2.519z"/>
+   <path fill="#ffcf21" d="m305.189 284.431c5.793 7.608 16.542 15.776 20.382 18.009 2.792 1.605 6.84 3.49 6.771 8.516-0.14 5.725-3.071 7.33-4.677 8.936-3.211 3.211-24.309 11.591-34.717 13.902-12.491 2.47-15.278 3.854-21.836 5.856-3.756 1.119-8.357 2.616-14.246 1.474-4.099-0.748-5.006-0.453-7.823-2.877-2.772-2.398-3.118-2.306-3.492-6.22-1.053-10.007-0.319-13.505 3.484-22.407 3.903-9.479 12.448-5.969 17.062-5.207 16.853 2.883 13.684-12.791 18.36-17.469 4.328-4.328 16.683-7.819 20.732-2.513z"/>
+   <path fill="#ffcf23" d="m305.137 284.504c5.778 7.59 16.503 15.736 20.332 17.965 2.786 1.602 6.825 3.482 6.755 8.496-0.139 5.709-3.064 7.311-4.665 8.912-3.204 3.203-24.474 11.642-34.759 13.721-12.51 2.244-14.829 3.52-21.421 5.598-3.729 1.155-8.457 2.635-14.327 1.499-4.082-0.739-4.86-0.389-7.667-2.8-2.76-2.389-2.897-2.083-3.268-5.979-1.04-9.979-0.627-13.24 3.104-22.138 3.903-9.653 12.503-5.762 17.093-4.991 16.799 2.922 13.475-13.111 18.141-17.777 4.318-4.316 16.643-7.799 20.682-2.506z"/>
+   <path fill="#ffcf26" d="m305.086 284.579c5.765 7.57 16.463 15.697 20.282 17.92 2.779 1.599 6.809 3.474 6.738 8.476-0.139 5.696-3.056 7.293-4.654 8.892-3.194 3.194-24.637 11.69-34.797 13.536-12.529 2.021-14.382 3.185-21.007 5.341-3.703 1.191-8.559 2.652-14.411 1.523-4.065-0.73-4.713-0.324-7.509-2.723-2.745-2.379-2.679-1.861-3.043-5.735-1.027-9.952-0.936-12.979 2.724-21.868 3.905-9.828 12.557-5.557 17.126-4.777 16.744 2.961 13.265-13.431 17.919-18.084 4.307-4.309 16.602-7.783 20.632-2.501z"/>
+   <path fill="#ffd028" d="m305.033 284.651c5.752 7.553 16.423 15.66 20.234 17.878 2.771 1.593 6.791 3.464 6.722 8.454-0.139 5.682-3.049 7.275-4.643 8.869-3.188 3.188-24.801 11.74-34.838 13.355-12.548 1.793-13.935 2.85-20.593 5.082-3.676 1.228-8.658 2.67-14.493 1.547-4.048-0.721-4.565-0.258-7.353-2.644-2.731-2.37-2.457-1.64-2.818-5.495-1.014-9.923-1.242-12.716 2.345-21.597 3.905-10.004 12.611-5.351 17.158-4.563 16.689 3 13.055-13.75 17.698-18.393 4.297-4.295 16.562-7.761 20.581-2.493z"/>
+   <path fill="#ffd02b" d="m304.982 284.724c5.737 7.534 16.382 15.622 20.184 17.834 2.766 1.59 6.774 3.456 6.705 8.433-0.138 5.67-3.041 7.26-4.631 8.85-3.18 3.179-24.966 11.789-34.877 13.172-12.568 1.568-13.487 2.515-20.179 4.824-3.65 1.263-8.759 2.688-14.575 1.572-4.031-0.713-4.42-0.195-7.196-2.566-2.718-2.361-2.238-1.42-2.594-5.254-1.001-9.896-1.549-12.453 1.964-21.328 3.907-10.178 12.666-5.145 17.192-4.348 16.634 3.039 12.844-14.068 17.476-18.701 4.285-4.286 16.521-7.743 20.531-2.488z"/>
+   <path fill="#ffd02d" d="m304.93 284.797c5.723 7.516 16.342 15.584 20.135 17.789 2.758 1.588 6.758 3.449 6.688 8.414-0.138 5.654-3.034 7.24-4.619 8.826-3.173 3.172-25.13 11.84-34.918 12.99-12.587 1.344-13.039 2.18-19.766 4.564-3.622 1.301-8.856 2.709-14.657 1.599-4.014-0.704-4.272-0.13-7.039-2.489-2.702-2.352-2.018-1.197-2.369-5.012-0.987-9.868-1.855-12.189 1.584-21.057 3.908-10.354 12.722-4.94 17.226-4.135 16.578 3.078 12.634-14.389 17.254-19.009 4.275-4.273 16.481-7.721 20.481-2.48z"/>
+   <path fill="#ffd030" d="m304.879 284.87c5.709 7.498 16.302 15.547 20.085 17.748 2.752 1.582 6.741 3.438 6.673 8.391-0.139 5.642-3.027 7.224-4.609 8.806-3.164 3.164-25.293 11.89-34.956 12.808-12.606 1.119-12.592 1.844-19.352 4.308-3.596 1.336-8.958 2.726-14.739 1.622-3.997-0.695-4.127-0.065-6.882-2.411-2.69-2.343-1.799-0.976-2.146-4.771-0.974-9.84-2.163-11.928 1.204-20.787 3.91-10.529 12.777-4.734 17.258-3.92 16.524 3.117 12.424-14.707 17.034-19.316 4.263-4.267 16.439-7.706 20.43-2.478z"/>
+   <path fill="#ffd133" d="m304.826 284.943c5.695 7.479 16.263 15.509 20.036 17.703 2.745 1.579 6.726 3.431 6.656 8.372-0.137 5.627-3.02 7.205-4.597 8.783-3.157 3.156-25.458 11.939-34.997 12.625-12.626 0.893-12.145 1.51-18.938 4.049-3.569 1.373-9.058 2.745-14.822 1.646-3.979-0.686-3.979 0-6.725-2.332-2.676-2.334-1.578-0.756-1.921-4.529-0.961-9.813-2.471-11.665 0.824-20.516 3.91-10.705 12.83-4.529 17.29-3.707 16.47 3.156 12.215-15.027 16.813-19.625 4.255-4.253 16.401-7.684 20.381-2.469z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#995900" d="m52.494 273.618c-6.479 4.68-22.896 4.248-27.072 9.719-4.104 5.473 0.145 13.393 0.072 28.08 0 6.265-1.08 11.017-1.8 14.832-1.008 4.824-1.656 8.209 0.36 11.664 3.672 6.121 9.575 7.633 43.344 14.688 18.072 3.744 35.136 13.464 46.584 14.399 11.448 0.865 13.896-2.951 20.88-9.144 6.912-6.192 9.144-4.248 8.928-17.856-0.216-13.535-8.928-17.567-18.792-33.191s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-8.208 13.248-14.688 17.929z"/>
+   <path fill="#9e5e00" d="m52.598 273.905c-6.397 4.702-22.475 3.788-27.062 9.512-4.154 5.414 0.228 13.276 0.098 27.955-0.025 6.23-1.152 10.881-1.937 14.877-1.037 4.871-1.678 8.201 0.349 11.619 3.787 6.162 9.695 7.123 43.456 14.168 18.061 3.737 34.541 13.307 46.343 14.112 11.186 0.792 13.564-2.829 20.463-8.96 6.896-6.195 9.024-4.277 8.858-17.406-0.075-13.521-8.305-17.349-18.169-32.973s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-8.153 13.479-14.583 18.216z"/>
+   <path fill="#a36400" d="m52.703 274.193c-6.314 4.724-22.054 3.327-27.051 9.304-4.204 5.356 0.31 13.16 0.123 27.828-0.051 6.198-1.225 10.748-2.074 14.924-1.065 4.918-1.699 8.194 0.339 11.571 3.902 6.206 9.813 6.617 43.567 13.651 18.05 3.73 33.948 13.146 46.101 13.824 10.923 0.72 13.234-2.707 20.045-8.777 6.885-6.199 8.907-4.305 8.792-16.956 0.064-13.507-7.683-17.129-17.547-32.753s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-8.1 13.709-14.479 18.504z"/>
+   <path fill="#a86a00" d="m52.807 274.481c-6.231 4.745-21.633 2.866-27.04 9.094-4.255 5.299 0.393 13.047 0.148 27.702-0.076 6.167-1.297 10.616-2.211 14.972-1.095 4.965-1.721 8.188 0.328 11.524 4.018 6.25 9.932 6.108 43.679 13.134 18.039 3.721 33.354 12.988 45.86 13.535 10.659 0.648 12.902-2.585 19.627-8.593 6.869-6.203 8.788-4.335 8.723-16.507 0.205-13.492-7.06-16.909-16.924-32.533s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-8.045 13.94-14.374 18.792z"/>
+   <path fill="#ad7000" d="m52.912 274.769c-6.149 4.767-21.211 2.405-27.029 8.885-4.306 5.242 0.476 12.931 0.173 27.576-0.101 6.136-1.368 10.483-2.347 15.019-1.123 5.012-1.742 8.181 0.316 11.478 4.133 6.293 10.052 5.603 43.791 12.614 18.028 3.716 32.76 12.83 45.619 13.248 10.396 0.576 12.57-2.463 19.21-8.409 6.854-6.206 8.668-4.363 8.653-16.056 0.347-13.479-6.437-16.69-16.301-32.314s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.991 14.169-14.269 19.079z"/>
+   <path fill="#b27500" d="m53.016 275.057c-6.066 4.787-20.79 1.943-27.019 8.676-4.355 5.184 0.559 12.816 0.198 27.45-0.126 6.103-1.44 10.351-2.484 15.065-1.151 5.059-1.764 8.172 0.307 11.431 4.248 6.336 10.17 5.094 43.901 12.096 18.019 3.708 32.166 12.672 45.378 12.96 10.135 0.504 12.24-2.34 18.792-8.227 6.841-6.209 8.551-4.391 8.586-15.605 0.486-13.464-5.813-16.47-15.678-32.094s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.937 14.399-14.165 19.368z"/>
+   <path fill="#b77b00" d="m53.121 275.344c-5.983 4.811-20.369 1.484-27.008 8.469-4.406 5.126 0.641 12.7 0.224 27.324-0.151 6.068-1.512 10.216-2.621 15.111-1.181 5.105-1.785 8.166 0.295 11.385 4.363 6.379 10.289 4.586 44.014 11.576 18.008 3.701 31.572 12.515 45.137 12.672 9.872 0.433 11.909-2.217 18.375-8.041 6.825-6.215 8.431-4.422 8.518-15.156 0.627-13.45-5.191-16.251-15.056-31.875s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.884 14.631-14.062 19.655z"/>
+   <path fill="#bc8100" d="m53.225 275.633c-5.9 4.832-19.948 1.023-26.997 8.259-4.457 5.069 0.724 12.585 0.249 27.198-0.177 6.037-1.584 10.082-2.758 15.158-1.21 5.152-1.808 8.158 0.284 11.338 4.479 6.422 10.407 4.078 44.125 11.059 17.997 3.693 30.979 12.355 44.896 12.384 9.608 0.36 11.578-2.095 17.957-7.858 6.812-6.217 8.313-4.449 8.45-14.707 0.766-13.435-4.569-16.03-14.434-31.654s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.829 14.859-13.956 19.943z"/>
+   <path fill="#c18700" d="m53.329 275.92c-5.817 4.854-19.526 0.563-26.985 8.051-4.507 5.011 0.807 12.47 0.273 27.072-0.201 6.004-1.655 9.949-2.894 15.205-1.239 5.199-1.829 8.151 0.273 11.291 4.594 6.465 10.526 3.57 44.236 10.541 17.985 3.686 30.384 12.196 44.655 12.096 9.345 0.287 11.245-1.973 17.539-7.676 6.797-6.221 8.193-4.479 8.381-14.256 0.906-13.42-3.946-15.812-13.811-31.436s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.774 15.094-13.851 20.232z"/>
+   <path fill="#c68c00" d="m53.433 276.209c-5.734 4.875-19.104 0.101-26.975 7.84-4.558 4.955 0.89 12.355 0.299 26.947-0.227 5.973-1.728 9.816-3.031 15.252-1.267 5.246-1.851 8.145 0.263 11.244 4.709 6.508 10.646 3.063 44.349 10.022 17.975 3.679 29.79 12.038 44.413 11.808 9.083 0.217 10.915-1.851 17.122-7.492 6.782-6.224 8.074-4.506 8.313-13.806 1.048-13.405-3.323-15.592-13.188-31.216s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.722 15.322-13.749 20.521z"/>
+   <path fill="#cc9200" d="m53.538 276.497c-5.651 4.896-18.684-0.359-26.964 7.633-4.607 4.896 0.972 12.24 0.324 26.82-0.252 5.939-1.8 9.684-3.168 15.299-1.296 5.293-1.872 8.137 0.252 11.196 4.824 6.552 10.764 2.556 44.46 9.505 17.964 3.672 29.196 11.879 44.172 11.52 8.82 0.144 10.584-1.729 16.704-7.309 6.768-6.228 7.956-4.535 8.244-13.355 1.188-13.393-2.7-15.372-12.564-30.996s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.668 15.551-13.644 20.807z"/>
+   <path fill="#d19800" d="m53.642 276.786c-5.569 4.918-18.263-0.82-26.953 7.424-4.658 4.838 1.055 12.123 0.35 26.693-0.277 5.907-1.872 9.551-3.305 15.346-1.325 5.34-1.894 8.129 0.241 11.15 4.938 6.596 10.883 2.048 44.571 8.984 17.953 3.666 28.602 11.723 43.931 11.232 8.558 0.072 10.253-1.605 16.287-7.123 6.753-6.232 7.837-4.566 8.175-12.906 1.329-13.379-2.077-15.153-11.941-30.777s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.614 15.783-13.54 21.097z"/>
+   <path fill="#d69e00" d="m53.747 277.073c-5.486 4.94-17.842-1.281-26.942 7.215-4.709 4.781 1.138 12.01 0.374 26.568-0.302 5.875-1.943 9.417-3.441 15.393-1.354 5.387-1.915 8.123 0.23 11.104 5.055 6.639 11.002 1.541 44.684 8.467 17.942 3.658 28.008 11.563 43.688 10.944 8.296 0 9.923-1.483 15.869-6.941 6.74-6.235 7.72-4.593 8.108-12.456 1.468-13.363-1.455-14.933-11.319-30.557s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.56 16.012-13.435 21.383z"/>
+   <path fill="#dba300" d="m53.851 277.361c-5.403 4.962-17.421-1.741-26.932 7.007-4.759 4.723 1.221 11.893 0.399 26.441-0.327 5.843-2.016 9.283-3.578 15.439-1.383 5.434-1.937 8.115 0.22 11.057 5.169 6.682 11.12 1.033 44.795 7.949 17.932 3.649 27.414 11.404 43.448 10.656 8.031-0.072 9.59-1.361 15.451-6.758 6.725-6.238 7.6-4.623 8.039-12.006 1.609-13.35-0.832-14.714-10.696-30.338s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.504 16.245-13.33 21.673z"/>
+   <path fill="#e0a900" d="m53.956 277.649c-5.321 4.982-16.999-2.203-26.921 6.797-4.81 4.666 1.303 11.779 0.425 26.316-0.353 5.811-2.088 9.15-3.715 15.486-1.411 5.48-1.959 8.108 0.208 11.01 5.285 6.725 11.239 0.525 44.907 7.431 17.92 3.644 26.819 11.246 43.207 10.368 7.769-0.145 9.259-1.239 15.034-6.574 6.71-6.242 7.479-4.65 7.97-11.557 1.75-13.334-0.209-14.493-10.073-30.117s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.452 16.474-13.226 21.96z"/>
+   <path fill="#e5af00" d="m54.06 277.937c-5.238 5.004-16.578-2.664-26.91 6.588-4.86 4.608 1.386 11.664 0.45 26.19-0.378 5.777-2.16 9.018-3.853 15.533-1.439 5.526-1.979 8.101 0.198 10.963 5.4 6.768 11.358 0.018 45.018 6.912 17.91 3.635 26.227 11.088 42.967 10.08 7.506-0.217 8.928-1.117 14.615-6.391 6.696-6.246 7.362-4.68 7.902-11.105 1.89-13.32 0.414-14.274-9.45-29.898s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.397 16.704-13.121 22.248z"/>
+   <path fill="#eab500" d="m54.165 278.225c-5.155 5.025-16.157-3.124-26.899 6.38-4.91 4.55 1.469 11.548 0.476 26.063-0.403 5.746-2.232 8.885-3.989 15.58-1.469 5.573-2.002 8.094 0.188 10.916 5.515 6.812 11.477-0.49 45.129 6.394 17.899 3.629 25.633 10.93 42.725 9.792 7.243-0.288 8.598-0.993 14.199-6.206 6.681-6.25 7.243-4.709 7.833-10.656 2.031-13.306 1.037-14.055-8.827-29.679s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.346 16.935-13.019 22.536z"/>
+   <path fill="#efba00" d="m54.269 278.513c-5.073 5.048-15.736-3.585-26.889 6.171-4.961 4.492 1.552 11.434 0.5 25.938-0.428 5.713-2.304 8.752-4.125 15.627-1.498 5.621-2.023 8.086 0.176 10.869 5.631 6.854 11.596-0.996 45.241 5.875 17.889 3.623 25.038 10.771 42.483 9.504 6.981-0.359 8.266-0.871 13.781-6.022 6.668-6.253 7.125-4.737 7.766-10.206 2.17-13.291 1.659-13.835-8.205-29.459s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.289 17.164-12.912 22.823z"/>
+   <path fill="#f4c000" d="m54.374 278.801c-4.99 5.068-15.314-4.047-26.878 5.962-5.012 4.435 1.634 11.317 0.525 25.812-0.453 5.682-2.376 8.618-4.263 15.674-1.526 5.668-2.045 8.08 0.166 10.822 5.745 6.898 11.714-1.505 45.353 5.357 17.878 3.613 24.444 10.613 42.243 9.216 6.717-0.433 7.934-0.749 13.362-5.839 6.653-6.258 7.007-4.768 7.697-9.756 2.312-13.277 2.282-13.616-7.582-29.24s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.235 17.395-12.807 23.112z"/>
+   <path fill="#f9c600" d="m54.477 279.088c-4.906 5.092-14.893-4.506-26.866 5.754-5.062 4.377 1.717 11.203 0.551 25.686-0.479 5.648-2.448 8.485-4.399 15.721-1.555 5.715-2.066 8.072 0.155 10.775 5.86 6.941 11.833-2.012 45.464 4.839 17.867 3.607 23.851 10.454 42.001 8.929 6.455-0.504 7.604-0.627 12.946-5.656 6.638-6.26 6.886-4.795 7.628-9.307 2.452-13.262 2.905-13.396-6.959-29.02s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.182 17.626-12.705 23.399z"/>
+   <path fill="#fc0" d="m54.582 279.377c-4.823 5.111-14.472-4.969-26.855 5.543-5.112 4.32 1.8 11.088 0.576 25.561-0.504 5.616-2.521 8.352-4.536 15.768-1.584 5.76-2.088 8.064 0.144 10.729 5.977 6.984 11.952-2.52 45.576 4.32 17.856 3.6 23.256 10.295 41.76 8.64 6.192-0.576 7.272-0.504 12.528-5.472 6.624-6.264 6.768-4.824 7.56-8.856 2.592-13.248 3.528-13.176-6.336-28.8s-11.448-18.504-18-28.872c-6.552-10.224-19.512-28.8-26.928-29.017-5.904-0.144-9.216 3.024-12.888 6.769s-7.129 17.855-12.601 23.687z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#fc0" d="m57.701 285.002c-4.278 4.539-18.28-1.36-24.892 3.631-4.732 3.5 2.398 7.908 1.426 20.873-0.389 4.926-3.824 5.834-2.398 12.64 1.103 5.121 2.27 4.991 4.214 7.325 5.315 6.223 4.084 1.686 34.355 7.777 16.011 3.242 20.938 9.271 37.596 7.779 5.575-0.518 6.612-0.453 11.279-4.926 5.964-5.575 2.917-4.408 3.565-7.973 2.269-11.863 0.453-13.938-8.428-28.004-8.88-14.066-8.102-14.844-13.936-24.113-5.834-9.141-13.872-25.799-20.549-25.93-5.25-0.129-8.297 2.723-11.603 6.094-3.305 3.372-5.768 19.643-10.629 24.827z"/>
+   <path fill="#ffcc02" d="m57.995 285.094c-4.461 4.701-18.604-1.196-25.06 3.705-4.701 3.514 2.578 8.05 1.608 20.68-0.4 4.896-3.733 5.877-2.458 12.634 0.986 5.093 2.357 4.938 4.334 7.201 5.686 6.131 4.673 1.826 34.119 7.743 15.918 3.211 20.815 9.215 37.372 7.732 5.541-0.513 6.479-0.463 11.155-4.849 5.865-5.407 2.858-4.287 3.412-8.058 2.066-11.787 0.442-13.981-8.188-27.649-8.83-13.983-8.143-14.698-13.941-23.913-5.8-9.085-13.701-25.805-20.338-25.934-5.219-0.129-8.248 2.705-11.533 6.057-3.287 3.352-5.644 19.505-10.482 24.651z"/>
+   <path fill="#ffcc05" d="m58.289 285.185c-4.644 4.866-18.93-1.031-25.229 3.78-4.669 3.527 2.759 8.191 1.792 20.488-0.413 4.866-3.642 5.918-2.519 12.625 0.872 5.066 2.447 4.887 4.455 7.078 6.057 6.04 5.263 1.969 33.883 7.709 15.825 3.18 20.693 9.159 37.148 7.686 5.508-0.506 6.345-0.471 11.03-4.77 5.768-5.24 2.803-4.168 3.26-8.142 1.865-11.716 0.432-14.027-7.949-27.298-8.78-13.899-8.183-14.553-13.948-23.713-5.764-9.03-13.529-25.811-20.126-25.938-5.188-0.129-8.198 2.688-11.465 6.021-3.266 3.331-5.517 19.368-10.332 24.474z"/>
+   <path fill="#ffcc07" d="m58.584 285.276c-4.827 5.03-19.255-0.865-25.397 3.855-4.639 3.541 2.938 8.332 1.975 20.295-0.425 4.838-3.551 5.961-2.578 12.619 0.757 5.039 2.536 4.834 4.575 6.955 6.428 5.949 5.852 2.108 33.646 7.674 15.733 3.147 20.571 9.103 36.925 7.639 5.475-0.501 6.211-0.48 10.905-4.693 5.67-5.072 2.745-4.045 3.107-8.224 1.663-11.642 0.42-14.073-7.711-26.946-8.73-13.814-8.223-14.406-13.952-23.511-5.729-8.976-13.358-25.817-19.916-25.944-5.156-0.127-8.148 2.674-11.396 5.984s-5.391 19.229-10.183 24.297z"/>
+   <path fill="#ffcd0a" d="m58.878 285.368c-5.01 5.193-19.579-0.701-25.565 3.93-4.607 3.555 3.117 8.475 2.157 20.102-0.437 4.809-3.459 6.004-2.639 12.613 0.643 5.011 2.626 4.781 4.695 6.83 6.799 5.857 6.442 2.25 33.411 7.64 15.641 3.118 20.45 9.048 36.701 7.593 5.44-0.494 6.076-0.488 10.781-4.615 5.57-4.904 2.688-3.926 2.954-8.308 1.462-11.569 0.409-14.118-7.472-26.593-8.68-13.732-8.263-14.262-13.958-23.311-5.695-8.922-13.188-25.824-19.705-25.951-5.125-0.127-8.1 2.658-11.326 5.949-3.227 3.289-5.266 19.091-10.034 24.121z"/>
+   <path fill="#ffcd0c" d="m59.173 285.458c-5.193 5.358-19.905-0.535-25.734 4.008-4.577 3.566 3.297 8.613 2.34 19.908-0.449 4.778-3.368 6.045-2.698 12.605 0.526 4.982 2.715 4.729 4.815 6.707 7.17 5.766 7.031 2.391 33.175 7.604 15.549 3.088 20.328 8.994 36.477 7.547 5.408-0.488 5.943-0.498 10.657-4.537 5.472-4.737 2.63-3.805 2.802-8.393 1.261-11.494 0.398-14.162-7.232-26.24-8.63-13.647-8.304-14.117-13.964-23.109-5.66-8.867-13.017-25.829-19.494-25.956-5.094-0.126-8.05 2.642-11.257 5.912-3.21 3.27-5.142 18.955-9.887 23.944z"/>
+   <path fill="#ffcd0f" d="m59.467 285.547c-5.376 5.523-20.229-0.369-25.903 4.084-4.545 3.58 3.478 8.756 2.523 19.715-0.461 4.75-3.277 6.088-2.758 12.599 0.411 4.955 2.804 4.677 4.936 6.584 7.541 5.675 7.621 2.532 32.938 7.569 15.456 3.056 20.206 8.938 36.253 7.5 5.375-0.482 5.811-0.506 10.533-4.459 5.374-4.57 2.572-3.686 2.649-8.477 1.058-11.42 0.387-14.209-6.995-25.888-8.58-13.563-8.344-13.972-13.969-22.909-5.626-8.813-12.846-25.834-19.283-25.961-5.063-0.125-8 2.625-11.188 5.877-3.188 3.251-5.015 18.818-9.736 23.766z"/>
+   <path fill="#ffcd11" d="m59.76 285.639c-5.559 5.688-20.555-0.205-26.071 4.158-4.515 3.594 3.657 8.896 2.706 19.521-0.473 4.721-3.186 6.131-2.818 12.594 0.297 4.926 2.894 4.623 5.057 6.459 7.911 5.584 8.21 2.674 32.703 7.535 15.362 3.025 20.084 8.883 36.027 7.453 5.342-0.477 5.677-0.515 10.409-4.381 5.275-4.402 2.516-3.564 2.497-8.561 0.855-11.348 0.375-14.254-6.756-25.535-8.53-13.479-8.385-13.825-13.976-22.709-5.59-8.758-12.673-25.842-19.071-25.965-5.031-0.125-7.951 2.608-11.119 5.838-3.168 3.232-4.888 18.684-9.588 23.593z"/>
+   <path fill="#ffce14" d="m60.055 285.73c-5.742 5.851-20.88-0.04-26.24 4.233-4.483 3.607 3.837 9.039 2.889 19.33-0.485 4.69-3.095 6.172-2.878 12.584 0.182 4.9 2.982 4.572 5.177 6.338 8.282 5.492 8.8 2.814 32.467 7.498 15.271 2.996 19.962 8.828 35.804 7.408 5.309-0.472 5.543-0.523 10.285-4.304 5.177-4.235 2.458-3.444 2.344-8.644 0.654-11.273 0.364-14.299-6.518-25.184-8.479-13.395-8.425-13.679-13.98-22.507-5.556-8.704-12.502-25.849-18.86-25.972-5-0.123-7.901 2.593-11.05 5.803s-4.765 18.547-9.44 23.417z"/>
+   <path fill="#ffce16" d="m60.349 285.821c-5.925 6.016-21.205 0.125-26.408 4.309-4.453 3.621 4.017 9.18 3.07 19.137-0.496 4.662-3.002 6.215-2.938 12.579 0.066 4.872 3.072 4.518 5.298 6.213 8.653 5.401 9.389 2.956 32.23 7.464 15.178 2.964 19.84 8.771 35.58 7.361 5.275-0.465 5.409-0.532 10.159-4.225 5.079-4.068 2.401-3.324 2.192-8.729 0.452-11.2 0.354-14.346-6.279-24.831-8.429-13.312-8.464-13.534-13.985-22.306-5.521-8.65-12.331-25.854-18.649-25.978-4.969-0.123-7.853 2.577-10.98 5.767-3.129 3.19-4.637 18.409-9.29 23.239z"/>
+   <path fill="#ffce19" d="m60.643 285.911c-6.107 6.18-21.529 0.291-26.577 4.385-4.421 3.635 4.197 9.322 3.254 18.945-0.508 4.631-2.911 6.256-2.997 12.571-0.049 4.845 3.161 4.465 5.418 6.089 9.023 5.309 9.979 3.098 31.994 7.43 15.085 2.934 19.718 8.717 35.355 7.314 5.242-0.459 5.276-0.541 10.036-4.148 4.98-3.899 2.344-3.203 2.039-8.811 0.25-11.127 0.342-14.391-6.04-24.479-8.38-13.228-8.505-13.389-13.991-22.105-5.486-8.596-12.16-25.859-18.438-25.982-4.938-0.123-7.803 2.561-10.911 5.73-3.109 3.17-4.513 18.272-9.142 23.061z"/>
+   <path fill="#ffce1c" d="m60.938 286.002c-6.291 6.344-21.855 0.455-26.746 4.459-4.391 3.648 4.377 9.463 3.437 18.752-0.521 4.603-2.82 6.299-3.058 12.564-0.163 4.817 3.251 4.413 5.539 5.965 9.395 5.219 10.567 3.24 31.758 7.396 14.993 2.903 19.597 8.661 35.132 7.269 5.209-0.453 5.143-0.55 9.912-4.07 4.882-3.732 2.286-3.082 1.887-8.895 0.048-11.053 0.329-14.436-5.802-24.126-8.33-13.144-8.545-13.243-13.997-21.905-5.451-8.541-11.988-25.865-18.228-25.988-4.906-0.121-7.753 2.545-10.843 5.695-3.088 3.149-4.385 18.132-8.991 22.884z"/>
+   <path fill="#ffcf1e" d="m61.232 286.092c-6.473 6.51-22.18 0.621-26.914 4.535-4.359 3.662 4.557 9.604 3.619 18.559-0.532 4.574-2.729 6.342-3.117 12.559-0.278 4.789 3.34 4.36 5.659 5.842 9.766 5.127 11.157 3.381 31.521 7.359 14.9 2.872 19.475 8.607 34.908 7.223 5.176-0.447 5.008-0.559 9.787-3.992 4.784-3.565 2.229-2.963 1.735-8.979-0.155-10.98 0.317-14.482-5.564-23.773-8.279-13.061-8.585-13.098-14.002-21.705-5.416-8.485-11.817-25.871-18.017-25.992-4.875-0.121-7.704 2.527-10.773 5.658-3.068 3.128-4.26 17.995-8.842 22.706z"/>
+   <path fill="#ffcf21" d="m61.526 286.184c-6.655 6.673-22.505 0.785-27.082 4.611-4.328 3.674 4.736 9.744 3.802 18.365-0.544 4.543-2.638 6.383-3.178 12.551-0.394 4.761 3.43 4.308 5.78 5.718 10.136 5.036 11.746 3.522 31.285 7.325 14.808 2.841 19.353 8.551 34.685 7.176 5.142-0.441 4.875-0.567 9.663-3.914 4.685-3.398 2.171-2.842 1.582-9.063-0.357-10.906 0.307-14.527-5.325-23.422-8.23-12.976-8.625-12.951-14.008-21.503-5.382-8.432-11.646-25.878-17.806-25.999-4.844-0.119-7.654 2.512-10.704 5.622-3.049 3.109-4.134 17.859-8.694 22.533z"/>
+   <path fill="#ffcf23" d="m61.821 286.275c-6.839 6.837-22.83 0.95-27.251 4.687-4.298 3.688 4.916 9.886 3.984 18.172-0.557 4.515-2.546 6.426-3.237 12.545-0.509 4.732 3.519 4.255 5.9 5.594 10.507 4.945 12.336 3.663 31.05 7.29 14.715 2.812 19.23 8.496 34.46 7.129 5.108-0.435 4.74-0.575 9.538-3.835 4.587-3.23 2.113-2.723 1.43-9.146-0.559-10.834 0.296-14.572-5.086-23.069-8.18-12.892-8.666-12.806-14.014-21.302-5.347-8.377-11.476-25.885-17.595-26.004-4.813-0.119-7.605 2.496-10.635 5.584-3.029 3.088-4.008 17.722-8.544 22.355z"/>
+   <path fill="#ffcf26" d="m62.115 286.366c-7.021 7.002-23.154 1.115-27.42 4.762-4.266 3.701 5.096 10.027 4.168 17.979-0.568 4.486-2.455 6.469-3.297 12.538-0.624 4.706 3.607 4.203 6.021 5.472 10.878 4.852 12.925 3.803 30.813 7.254 14.622 2.78 19.108 8.441 34.236 7.084 5.075-0.43 4.606-0.584 9.413-3.759 4.489-3.063 2.058-2.601 1.277-9.229-0.761-10.76 0.284-14.618-4.848-22.717-8.129-12.809-8.706-12.66-14.019-21.102-5.313-8.322-11.304-25.891-17.384-26.01-4.781-0.118-7.556 2.48-10.566 5.55-3.008 3.068-3.881 17.584-8.394 22.178z"/>
+   <path fill="#ffd028" d="m62.409 286.456c-7.204 7.166-23.479 1.281-27.588 4.838-4.235 3.715 5.275 10.168 4.351 17.787-0.58 4.455-2.364 6.51-3.357 12.53-0.738 4.679 3.697 4.149 6.142 5.347 11.249 4.763 13.515 3.946 30.577 7.221 14.529 2.748 18.986 8.386 34.012 7.037 5.043-0.424 4.474-0.594 9.289-3.68 4.392-2.897 2-2.481 1.125-9.314-0.963-10.686 0.273-14.664-4.608-22.364-8.079-12.726-8.746-12.517-14.024-20.901-5.277-8.269-11.133-25.896-17.173-26.015-4.75-0.116-7.506 2.464-10.497 5.513-2.992 3.047-3.759 17.447-8.249 22.001z"/>
+   <path fill="#ffd02b" d="m62.704 286.547c-7.388 7.33-23.805 1.445-27.757 4.912-4.204 3.729 5.455 10.311 4.533 17.594-0.593 4.427-2.272 6.553-3.417 12.523-0.854 4.651 3.786 4.098 6.262 5.225 11.619 4.671 14.104 4.087 30.341 7.185 14.438 2.72 18.864 8.33 33.787 6.991 5.01-0.418 4.341-0.604 9.166-3.604 4.292-2.729 1.942-2.359 0.972-9.396-1.163-10.613 0.263-14.709-4.369-22.012-8.03-12.641-8.787-12.371-14.03-20.7-5.243-8.214-10.962-25.903-16.962-26.021-4.719-0.117-7.457 2.447-10.428 5.477-2.972 3.029-3.632 17.313-8.098 21.826z"/>
+   <path fill="#ffd02d" d="m62.998 286.638c-7.57 7.493-24.13 1.61-27.925 4.987-4.174 3.742 5.635 10.451 4.716 17.4-0.604 4.398-2.182 6.596-3.478 12.518-0.969 4.623 3.875 4.045 6.382 5.101 11.991 4.579 14.694 4.228 30.105 7.149 14.345 2.688 18.743 8.275 33.563 6.944 4.977-0.411 4.207-0.61 9.042-3.524 4.193-2.562 1.884-2.239 0.819-9.481-1.366-10.538 0.251-14.754-4.133-21.659-7.979-12.557-8.825-12.224-14.034-20.498-5.208-8.16-10.791-25.91-16.751-26.027-4.688-0.114-7.407 2.433-10.358 5.441-2.951 3.01-3.505 17.174-7.948 21.649z"/>
+   <path fill="#ffd030" d="m63.292 286.729c-7.753 7.658-24.454 1.775-28.094 5.063-4.142 3.756 5.815 10.594 4.899 17.209-0.616 4.367-2.09 6.638-3.537 12.51-1.084 4.596 3.964 3.992 6.502 4.977 12.362 4.488 15.283 4.369 29.869 7.115 14.252 2.656 18.621 8.22 33.34 6.898 4.943-0.406 4.073-0.621 8.917-3.447 4.095-2.395 1.828-2.119 0.667-9.565-1.568-10.465 0.239-14.8-3.894-21.307-7.929-12.474-8.866-12.078-14.04-20.298-5.173-8.105-10.619-25.916-16.54-26.031-4.656-0.115-7.357 2.415-10.289 5.404-2.932 2.988-3.38 17.036-7.8 21.472z"/>
+   <path fill="#ffd133" d="m63.587 286.82c-7.937 7.822-24.78 1.94-28.263 5.138-4.111 3.77 5.995 10.734 5.081 17.016-0.627 4.339-1.998 6.68-3.597 12.504-1.199 4.568 4.054 3.939 6.623 4.854 12.732 4.396 15.873 4.51 29.633 7.08 14.16 2.625 18.499 8.164 33.116 6.852 4.909-0.4 3.939-0.629 8.793-3.369 3.997-2.227 1.77-1.999 0.514-9.648-1.771-10.393 0.228-14.846-3.654-20.955-7.88-12.39-8.907-11.934-14.046-20.098-5.139-8.051-10.448-25.922-16.329-26.037-4.625-0.113-7.309 2.398-10.221 5.368s-3.254 16.897-7.65 21.295z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m88.782 218.681c-0.936 2.088-1.728 20.017 2.952 27 4.68 6.911 3.312 10.872-1.872 5.616-5.4-5.112-8.928-12.816-9-18.145 0-3.096 2.376-15.84 3.313-17.208 1.007-1.44 5.327 1.153 4.607 2.737z"/>
+   <path fill="#030303" d="m88.692 219.032c-0.903 2.34-1.656 19.698 3.01 26.668 4.665 6.901 3.186 10.49-1.84 5.356-5.23-4.997-8.607-12.47-8.741-17.787-0.043-3.114 2.236-15.419 3.133-16.791 0.961-1.394 5.126 0.989 4.438 2.554z"/>
+   <path fill="#070707" d="m88.602 219.379c-0.871 2.593-1.584 19.383 3.067 26.338 4.65 6.891 3.06 10.109-1.808 5.098-5.062-4.882-8.287-12.125-8.481-17.432-0.087-3.131 2.095-14.998 2.952-16.373 0.915-1.345 4.926 0.828 4.27 2.369z"/>
+   <path fill="#0b0b0b" d="m88.512 219.729c-0.839 2.844-1.513 19.066 3.124 26.006 4.638 6.881 2.935 9.729-1.774 4.84-4.893-4.768-7.967-11.779-8.223-17.076-0.129-3.149 1.955-14.576 2.772-15.955 0.868-1.299 4.724 0.665 4.101 2.185z"/>
+   <path fill="#0f0f0f" d="m88.422 220.079c-0.806 3.096-1.439 18.748 3.183 25.674 4.623 6.869 2.809 9.347-1.742 4.58-4.724-4.651-7.646-11.434-7.963-16.719-0.173-3.168 1.814-14.154 2.592-15.537 0.819-1.252 4.52 0.504 3.93 2.002z"/>
+   <path fill="#131313" d="m88.332 220.426c-0.773 3.349-1.368 18.433 3.24 25.345 4.608 6.858 2.682 8.964-1.71 4.319-4.554-4.535-7.326-11.088-7.704-16.361-0.216-3.186 1.674-13.734 2.412-15.12 0.774-1.206 4.32 0.343 3.762 1.817z"/>
+   <path fill="#161616" d="m88.242 220.777c-0.741 3.601-1.296 18.115 3.298 25.013 4.594 6.848 2.556 8.582-1.678 4.061-4.385-4.421-7.006-10.742-7.444-16.006-0.26-3.203 1.533-13.313 2.231-14.702 0.728-1.16 4.118 0.18 3.593 1.634z"/>
+   <path fill="#1a1a1a" d="m88.152 221.125c-0.709 3.853-1.224 17.799 3.355 24.682 4.579 6.837 2.43 8.201-1.646 3.802-4.216-4.306-6.686-10.397-7.186-15.649-0.303-3.221 1.394-12.892 2.052-14.285 0.682-1.112 3.918 0.018 3.425 1.45z"/>
+   <path fill="#1e1e1e" d="m88.062 221.475c-0.677 4.104-1.152 17.482 3.413 24.35 4.564 6.826 2.304 7.82-1.613 3.543-4.046-4.191-6.365-10.051-6.927-15.293-0.345-3.24 1.253-12.47 1.872-13.867 0.634-1.066 3.716-0.144 3.255 1.267z"/>
+   <path fill="#222" d="m87.972 221.825c-0.645 4.355-1.08 17.164 3.47 24.018 4.551 6.816 2.179 7.439-1.58 3.285-3.877-4.076-6.044-9.707-6.667-14.938-0.389-3.258 1.112-12.049 1.691-13.449 0.587-1.019 3.514-0.306 3.086 1.084z"/>
+   <path fill="#262626" d="m87.883 222.172c-0.612 4.609-1.009 16.849 3.527 23.688 4.536 6.804 2.052 7.056-1.548 3.024-3.708-3.961-5.724-9.36-6.408-14.58-0.432-3.276 0.973-11.629 1.513-13.032 0.54-0.971 3.311-0.467 2.916 0.9z"/>
+   <path fill="#2a2a2a" d="m87.792 222.523c-0.579 4.86-0.936 16.531 3.586 23.356 4.521 6.793 1.926 6.675-1.516 2.765-3.539-3.845-5.403-9.015-6.148-14.224-0.476-3.293 0.831-11.207 1.332-12.614 0.493-0.925 3.11-0.63 2.746 0.717z"/>
+   <path fill="#2d2d2d" d="m87.702 222.872c-0.547 5.112-0.864 16.215 3.644 23.025 4.507 6.783 1.8 6.293-1.483 2.506-3.369-3.73-5.083-8.669-5.89-13.867-0.519-3.312 0.691-10.785 1.152-12.197 0.446-0.878 2.908-0.792 2.577 0.533z"/>
+   <path fill="#313131" d="m87.612 223.221c-0.515 5.363-0.792 15.898 3.701 22.693 4.492 6.772 1.674 5.912-1.451 2.248-3.2-3.615-4.763-8.324-5.63-13.512-0.563-3.33 0.551-10.363 0.972-11.779 0.399-0.831 2.707-0.953 2.408 0.35z"/>
+   <path fill="#353535" d="m87.522 223.57c-0.482 5.616-0.72 15.581 3.758 22.363 4.479 6.761 1.549 5.53-1.418 1.987-3.031-3.5-4.442-7.978-5.371-13.154-0.604-3.348 0.41-9.943 0.792-11.361 0.352-0.785 2.506-1.115 2.239 0.165z"/>
+   <path fill="#393939" d="m87.432 223.918c-0.45 5.869-0.648 15.265 3.815 22.033 4.464 6.75 1.422 5.147-1.386 1.728-2.862-3.384-4.122-7.632-5.112-12.798-0.647-3.366 0.271-9.522 0.612-10.944 0.307-0.737 2.305-1.278 2.071-0.019z"/>
+   <path fill="#3d3d3d" d="m87.343 224.269c-0.418 6.12-0.576 14.946 3.873 21.7 4.45 6.74 1.296 4.767-1.354 1.469-2.692-3.27-3.802-7.286-4.853-12.441-0.691-3.383 0.129-9.101 0.432-10.527 0.26-0.691 2.103-1.44 1.902-0.201z"/>
+   <path fill="#414141" d="m87.252 224.618c-0.385 6.373-0.504 14.631 3.932 21.369 4.436 6.729 1.17 4.385-1.321 1.211-2.523-3.154-3.481-6.941-4.594-12.086-0.734-3.402-0.011-8.68 0.252-10.109 0.212-0.644 1.901-1.602 1.731-0.385z"/>
+   <path fill="#444" d="m87.162 224.967c-0.353 6.623-0.432 14.314 3.989 21.037 4.421 6.719 1.044 4.004-1.289 0.951-2.354-3.039-3.161-6.595-4.334-11.729-0.778-3.42-0.151-8.258 0.071-9.691 0.166-0.597 1.7-1.763 1.563-0.568z"/>
+   <path fill="#484848" d="m87.072 225.316c-0.32 6.876-0.36 13.997 4.047 20.707 4.406 6.707 0.918 3.622-1.257 0.692-2.186-2.924-2.841-6.25-4.075-11.373-0.82-3.438-0.292-7.838-0.108-9.273 0.119-0.551 1.498-1.926 1.393-0.753z"/>
+   <path fill="#4c4c4c" d="m86.982 225.665c-0.288 7.129-0.288 13.68 4.104 20.377 4.393 6.695 0.792 3.24-1.224 0.432s-2.52-5.904-3.816-11.016c-0.863-3.457-0.432-7.416-0.287-8.856 0.071-0.505 1.295-2.089 1.223-0.937z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m88.782 218.681c4.32-9.433 6.696-19.584 12.888-29.448 6.12-9.792 3.672-13.608-0.863-8.64-4.536 4.968-9.504 15.48-9.504 15.48s-5.832 9.216-7.128 19.872c-0.217 1.8 3.887 4.248 4.607 2.736z"/>
+   <path fill="#020202" d="m88.968 218.071c4.279-9.5 6.615-19.246 12.586-28.802 5.901-9.488 3.608-13.279-0.764-8.472-4.403 4.847-9.302 15.236-9.368 15.381 0 0-5.637 8.993-6.877 19.239-0.209 1.771 3.72 4.145 4.423 2.654z"/>
+   <path fill="#050505" d="m89.152 217.459c4.239-9.566 6.535-18.908 12.284-28.155 5.683-9.183 3.547-12.95-0.663-8.303-4.27 4.725-9.099 14.991-9.231 15.282 0 0-5.442 8.766-6.627 18.605-0.201 1.741 3.554 4.042 4.237 2.571z"/>
+   <path fill="#070707" d="m89.338 216.849c4.199-9.634 6.454-18.572 11.981-27.51 5.465-8.878 3.484-12.621-0.563-8.135-4.137 4.605-8.896 14.748-9.096 15.184 0 0-5.247 8.542-6.376 17.972-0.192 1.713 3.387 3.937 4.054 2.489z"/>
+   <path fill="#0a0a0a" d="m89.522 216.239c4.159-9.701 6.375-18.234 11.68-26.865 5.247-8.573 3.422-12.292-0.461-7.966-4.005 4.483-8.693 14.503-8.96 15.085 0 0-5.053 8.317-6.126 17.337-0.186 1.684 3.219 3.837 3.867 2.409z"/>
+   <path fill="#0c0c0c" d="m89.708 215.627c4.118-9.769 6.294-17.897 11.376-26.218 5.029-8.268 3.36-11.962-0.359-7.797-3.871 4.361-8.49 14.259-8.823 14.985 0 0-4.858 8.093-5.876 16.706-0.179 1.653 3.051 3.731 3.682 2.324z"/>
+   <path fill="#0f0f0f" d="m89.893 215.017c4.077-9.836 6.213-17.56 11.073-25.573 4.812-7.963 3.298-11.633-0.259-7.629-3.738 4.241-8.288 14.015-8.688 14.887 0 0-4.663 7.868-5.625 16.072-0.169 1.624 2.886 3.628 3.499 2.243z"/>
+   <path fill="#111" d="m90.078 214.407c4.037-9.904 6.133-17.224 10.772-24.928 4.593-7.658 3.234-11.304-0.159-7.46-3.605 4.119-8.085 13.771-8.551 14.788 0 0-4.47 7.645-5.375 15.439-0.162 1.594 2.718 3.524 3.313 2.161z"/>
+   <path fill="#141414" d="m90.263 213.795c3.997-9.971 6.052-16.885 10.47-24.281 4.374-7.353 3.172-10.975-0.059-7.291-3.472 3.998-7.882 13.526-8.415 14.689 0 0-4.273 7.418-5.124 14.805-0.154 1.565 2.551 3.421 3.128 2.078z"/>
+   <path fill="#161616" d="m90.449 213.184c3.956-10.037 5.972-16.548 10.167-23.635 4.156-7.048 3.11-10.645 0.043-7.123-3.34 3.877-7.68 13.283-8.279 14.591 0 0-4.08 7.194-4.874 14.172-0.147 1.535 2.383 3.317 2.943 1.995z"/>
+   <path fill="#191919" d="m90.634 212.573c3.916-10.105 5.892-16.209 9.865-22.989 3.938-6.743 3.047-10.316 0.144-6.954-3.207 3.755-7.477 13.038-8.143 14.491 0 0-3.886 6.969-4.624 13.54-0.139 1.506 2.217 3.213 2.758 1.912z"/>
+   <path fill="#1c1c1c" d="m90.819 211.963c3.875-10.174 5.811-15.874 9.563-22.344 3.721-6.438 2.984-9.987 0.244-6.785-3.073 3.634-7.274 12.793-8.007 14.392 0 0-3.69 6.745-4.373 12.905-0.131 1.477 2.049 3.112 2.573 1.832z"/>
+   <path fill="#1e1e1e" d="m91.004 211.352c3.836-10.24 5.73-15.536 9.262-21.698 3.501-6.133 2.922-9.658 0.344-6.617-2.94 3.513-7.071 12.55-7.87 14.293 0 0-3.496 6.521-4.123 12.272-0.124 1.447 1.881 3.009 2.387 1.75z"/>
+   <path fill="#212121" d="m91.189 210.741c3.795-10.307 5.649-15.198 8.958-21.052 3.284-5.828 2.859-9.328 0.445-6.448-2.808 3.392-6.868 12.305-7.734 14.195 0 0-3.301 6.295-3.872 11.639-0.115 1.418 1.715 2.904 2.203 1.666z"/>
+   <path fill="#232323" d="m91.375 210.129c3.754-10.373 5.569-14.86 8.655-20.405 3.066-5.523 2.797-8.999 0.547-6.279-2.675 3.27-6.666 12.061-7.599 14.097 0 0-3.106 6.07-3.622 11.004-0.107 1.388 1.548 2.801 2.019 1.583z"/>
+   <path fill="#262626" d="m91.559 209.519c3.714-10.44 5.489-14.523 8.354-19.76 2.847-5.218 2.735-8.67 0.647-6.111-2.542 3.149-6.463 11.817-7.462 13.997 0 0-2.912 5.848-3.372 10.373-0.099 1.357 1.381 2.697 1.833 1.501z"/>
+   <path fill="#282828" d="m91.745 208.909c3.674-10.509 5.408-14.187 8.051-19.115 2.629-4.913 2.672-8.341 0.748-5.942-2.409 3.028-6.261 11.573-7.326 13.898 0 0-2.717 5.621-3.121 9.738-0.092 1.33 1.213 2.595 1.648 1.421z"/>
+   <path fill="#2b2b2b" d="m91.929 208.297c3.634-10.575 5.328-13.848 7.75-18.468 2.41-4.608 2.609-8.011 0.848-5.773-2.275 2.906-6.058 11.328-7.189 13.799 0 0-2.522 5.397-2.871 9.106-0.084 1.299 1.046 2.491 1.462 1.336z"/>
+   <path fill="#2d2d2d" d="m92.115 207.687c3.593-10.643 5.247-13.512 7.447-17.823 2.191-4.303 2.547-7.682 0.949-5.605-2.144 2.786-5.855 11.085-7.055 13.701 0 0-2.327 5.172-2.62 8.473-0.076 1.269 0.881 2.386 1.279 1.254z"/>
+   <path fill="#303030" d="m92.301 207.077c3.552-10.71 5.167-13.175 7.145-17.178 1.974-3.998 2.484-7.353 1.05-5.436-2.011 2.664-5.652 10.84-6.918 13.602 0 0-2.133 4.947-2.37 7.839-0.07 1.24 0.712 2.283 1.093 1.173z"/>
+   <path fill="#333" d="m92.485 206.465c3.513-10.778 5.087-12.837 6.843-16.531s2.422-7.024 1.15-5.268c-1.877 2.543-5.449 10.596-6.781 13.502 0 0-1.938 4.724-2.12 7.207-0.061 1.211 0.545 2.18 0.908 1.09z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m273.03 225.592c2.088-5.903 1.872-20.951-3.456-30.671-1.872-3.528-3.672-7.632-4.752-7.848-1.152-0.216-3.24 2.088-3.024 2.448 0.288 0.576 10.009 14.256 7.992 32.832-0.144 1.513 2.736 4.608 3.24 3.239z"/>
+   <path fill="#030303" d="m272.936 224.831c2.025-5.719 1.753-20.379-3.344-29.663-1.815-3.407-3.535-7.374-4.595-7.59-1.122-0.214-3.125 2.022-2.925 2.367 0.258 0.562 9.605 13.778 7.729 31.753-0.129 1.487 2.647 4.456 3.135 3.133z"/>
+   <path fill="#070707" d="m272.841 224.068c1.967-5.532 1.637-19.808-3.228-28.654-1.762-3.286-3.401-7.115-4.44-7.332-1.091-0.211-3.009 1.956-2.824 2.287 0.227 0.548 9.201 13.299 7.466 30.672-0.118 1.463 2.555 4.305 3.026 3.027z"/>
+   <path fill="#0b0b0b" d="m272.747 223.305c1.904-5.348 1.518-19.235-3.115-27.645-1.706-3.165-3.265-6.856-4.282-7.073-1.062-0.21-2.896 1.889-2.727 2.206 0.197 0.534 8.799 12.821 7.203 29.592-0.103 1.44 2.466 4.153 2.921 2.92z"/>
+   <path fill="#0f0f0f" d="m272.652 222.542c1.843-5.162 1.398-18.662-3.001-26.635-1.65-3.044-3.13-6.598-4.127-6.815-1.03-0.207-2.779 1.823-2.626 2.126 0.167 0.52 8.396 12.341 6.94 28.511-0.09 1.416 2.376 4.001 2.814 2.813z"/>
+   <path fill="#131313" d="m272.558 221.779c1.78-4.976 1.279-18.09-2.889-25.626-1.595-2.923-2.994-6.34-3.97-6.557-1-0.205-2.664 1.756-2.527 2.045 0.137 0.506 7.993 11.861 6.679 27.432-0.078 1.392 2.285 3.849 2.707 2.706z"/>
+   <path fill="#161616" d="m272.463 221.016c1.721-4.79 1.163-17.518-2.773-24.617-1.539-2.802-2.858-6.081-3.814-6.299-0.969-0.203-2.548 1.691-2.427 1.965 0.106 0.492 7.59 11.383 6.415 26.352-0.065 1.369 2.194 3.697 2.599 2.599z"/>
+   <path fill="#1a1a1a" d="m272.369 220.254c1.659-4.605 1.044-16.946-2.66-23.609-1.483-2.681-2.723-5.822-3.658-6.04-0.938-0.201-2.434 1.624-2.326 1.884 0.074 0.478 7.185 10.904 6.15 25.271-0.051 1.344 2.106 3.546 2.494 2.494z"/>
+   <path fill="#1e1e1e" d="m272.274 219.491c1.598-4.42 0.926-16.373-2.546-22.6-1.43-2.56-2.587-5.564-3.501-5.782-0.908-0.198-2.319 1.558-2.229 1.804 0.044 0.464 6.782 10.425 5.889 24.19-0.037 1.321 2.016 3.396 2.387 2.388z"/>
+   <path fill="#222" d="m272.18 218.728c1.535-4.233 0.807-15.802-2.434-21.59-1.373-2.439-2.452-5.306-3.345-5.524-0.877-0.197-2.203 1.491-2.128 1.723 0.014 0.45 6.379 9.947 5.625 23.111-0.023 1.297 1.927 3.242 2.282 2.28z"/>
+   <path fill="#262626" d="m272.085 217.965c1.476-4.049 0.69-15.229-2.318-20.582-1.317-2.317-2.316-5.046-3.188-5.265-0.847-0.194-2.088 1.425-2.029 1.642-0.016 0.436 5.977 9.468 5.362 22.032-0.011 1.272 1.835 3.089 2.173 2.173z"/>
+   <path fill="#2a2a2a" d="m271.991 217.202c1.413-3.861 0.571-14.656-2.206-19.572-1.262-2.196-2.18-4.788-3.032-5.007-0.815-0.191-1.973 1.36-1.929 1.562-0.047 0.422 5.573 8.988 5.099 20.951 0.003 1.247 1.746 2.939 2.068 2.066z"/>
+   <path fill="#2d2d2d" d="m271.896 216.439c1.353-3.677 0.453-14.084-2.091-18.563-1.207-2.076-2.045-4.529-2.876-4.749-0.786-0.19-1.858 1.293-1.83 1.481-0.077 0.408 5.17 8.51 4.836 19.87 0.017 1.226 1.656 2.789 1.961 1.961z"/>
+   <path fill="#313131" d="m271.802 215.676c1.29-3.491 0.334-13.512-1.979-17.553-1.151-1.956-1.909-4.272-2.72-4.493-0.755-0.187-1.742 1.227-1.73 1.401-0.106 0.394 4.768 8.031 4.573 18.791 0.031 1.202 1.567 2.637 1.856 1.854z"/>
+   <path fill="#353535" d="m271.707 214.915c1.23-3.307 0.217-12.94-1.864-16.545-1.096-1.834-1.773-4.014-2.563-4.234-0.725-0.185-1.627 1.16-1.631 1.32-0.138 0.38 4.364 7.552 4.311 17.71 0.042 1.176 1.475 2.485 1.747 1.749z"/>
+   <path fill="#393939" d="m271.613 214.151c1.168-3.119 0.098-12.367-1.751-15.535-1.04-1.714-1.638-3.755-2.407-3.976-0.693-0.183-1.512 1.094-1.531 1.24-0.168 0.366 3.962 7.074 4.049 16.63 0.055 1.153 1.384 2.332 1.64 1.641z"/>
+   <path fill="#3d3d3d" d="m271.518 213.388c1.106-2.935-0.021-11.796-1.638-14.527-0.983-1.592-1.502-3.496-2.25-3.716-0.664-0.181-1.396 1.028-1.432 1.159-0.198 0.352 3.558 6.594 3.785 15.549 0.07 1.13 1.296 2.183 1.535 1.535z"/>
+   <path fill="#414141" d="m271.424 212.625c1.047-2.75-0.139-11.223-1.522-13.518-0.93-1.471-1.367-3.238-2.094-3.459-0.635-0.178-1.282 0.962-1.333 1.079-0.229 0.338 3.153 6.114 3.521 14.47 0.083 1.106 1.205 2.03 1.428 1.428z"/>
+   <path fill="#444" d="m271.329 211.862c0.985-2.563-0.256-10.65-1.409-12.508-0.874-1.35-1.23-2.979-1.938-3.2-0.604-0.177-1.166 0.895-1.233 0.998-0.259 0.324 2.751 5.636 3.259 13.39 0.096 1.082 1.115 1.876 1.321 1.32z"/>
+   <path fill="#484848" d="m271.235 211.099c0.923-2.377-0.375-10.077-1.296-11.499-0.818-1.229-1.097-2.72-1.781-2.942-0.573-0.174-1.052 0.829-1.134 0.918-0.289 0.309 2.348 5.156 2.996 12.309 0.11 1.058 1.025 1.726 1.215 1.214z"/>
+   <path fill="#4c4c4c" d="m271.14 210.336c0.861-2.192-0.493-9.506-1.183-10.49-0.763-1.107-0.96-2.463-1.625-2.684-0.542-0.172-0.936 0.762-1.034 0.836-0.319 0.297 1.945 4.68 2.733 11.229 0.124 1.035 0.936 1.576 1.109 1.109z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m264.822 187.073c-10.224-13.968-23.472-18.504-22.104-14.112 0 0 10.152 5.76 19.08 16.56 1.728 2.088 4.608-0.288 3.024-2.448z"/>
+   <path fill="#030303" d="m264.372 186.687c-9.924-13.495-22.894-17.912-21.539-13.7 0.018 0.012 9.901 5.614 18.609 16.071 1.678 2.016 4.467-0.285 2.93-2.371z"/>
+   <path fill="#070707" d="m263.922 186.3c-9.624-13.022-22.316-17.319-20.975-13.287 0.036 0.023 9.652 5.467 18.139 15.582 1.628 1.943 4.325-0.283 2.836-2.295z"/>
+   <path fill="#0b0b0b" d="m263.472 185.913c-9.324-12.549-21.739-16.726-20.41-12.874 0.053 0.034 9.4 5.32 17.668 15.093 1.578 1.871 4.183-0.28 2.742-2.219z"/>
+   <path fill="#0f0f0f" d="m263.022 185.527c-9.024-12.077-21.162-16.134-19.847-12.462 0.071 0.045 9.151 5.174 17.198 14.604 1.529 1.798 4.043-0.278 2.649-2.142z"/>
+   <path fill="#131313" d="m262.571 185.14c-8.723-11.603-20.583-15.541-19.28-12.049 0.088 0.056 8.901 5.027 16.728 14.114 1.477 1.726 3.899-0.275 2.552-2.065z"/>
+   <path fill="#161616" d="m262.121 184.753c-8.423-11.13-20.006-14.948-18.716-11.636 0.106 0.067 8.651 4.88 16.257 13.625 1.428 1.654 3.759-0.272 2.459-1.989z"/>
+   <path fill="#1a1a1a" d="m261.671 184.367c-8.124-10.658-19.428-14.356-18.15-11.224 0.124 0.078 8.399 4.734 15.785 13.136 1.378 1.581 3.617-0.27 2.365-1.912z"/>
+   <path fill="#1e1e1e" d="m261.221 183.98c-7.824-10.185-18.851-13.763-17.588-10.811 0.143 0.089 8.151 4.587 15.315 12.647 1.33 1.508 3.477-0.267 2.273-1.836z"/>
+   <path fill="#222" d="m260.771 183.593c-7.524-9.711-18.273-13.17-17.022-10.398 0.159 0.1 7.9 4.44 14.844 12.158 1.279 1.436 3.335-0.265 2.178-1.76z"/>
+   <path fill="#262626" d="m260.321 183.206c-7.224-9.238-17.695-12.578-16.458-9.985 0.177 0.111 7.65 4.293 14.374 11.668 1.229 1.364 3.193-0.262 2.084-1.683z"/>
+   <path fill="#2a2a2a" d="m259.871 182.82c-6.924-8.766-17.118-11.986-15.893-9.573 0.193 0.122 7.398 4.147 13.902 11.179 1.18 1.291 3.053-0.259 1.991-1.606z"/>
+   <path fill="#2d2d2d" d="m259.42 182.433c-6.623-8.293-16.539-11.393-15.328-9.16 0.214 0.133 7.15 4 13.434 10.69 1.128 1.219 2.909-0.257 1.894-1.53z"/>
+   <path fill="#313131" d="m258.97 182.046c-6.323-7.819-15.963-10.8-14.764-8.747 0.23 0.144 6.899 3.853 12.962 10.201 1.08 1.146 2.769-0.254 1.802-1.454z"/>
+   <path fill="#353535" d="m258.52 181.66c-6.023-7.347-15.384-10.208-14.199-8.335 0.248 0.155 6.649 3.707 12.492 9.712 1.028 1.073 2.627-0.252 1.707-1.377z"/>
+   <path fill="#393939" d="m258.07 181.273c-5.723-6.874-14.807-9.615-13.634-7.922 0.265 0.166 6.398 3.56 12.021 9.222 0.978 1.002 2.485-0.249 1.613-1.3z"/>
+   <path fill="#3d3d3d" d="m257.62 180.886c-5.423-6.401-14.229-9.021-13.07-7.509 0.283 0.177 6.149 3.413 11.552 8.733 0.927 0.929 2.343-0.246 1.518-1.224z"/>
+   <path fill="#414141" d="m257.17 180.5c-5.124-5.928-13.65-8.43-12.505-7.097 0.301 0.188 5.898 3.267 11.079 8.244 0.879 0.856 2.203-0.244 1.426-1.147z"/>
+   <path fill="#444" d="m256.719 180.113c-4.823-5.455-13.073-7.837-11.94-6.684 0.319 0.199 5.649 3.12 10.609 7.755 0.829 0.784 2.061-0.241 1.331-1.071z"/>
+   <path fill="#484848" d="m256.269 179.726c-4.523-4.982-12.495-7.244-11.375-6.271 0.336 0.21 5.397 2.973 10.138 7.266 0.779 0.711 1.92-0.239 1.237-0.995z"/>
+   <path fill="#4c4c4c" d="m255.819 179.339c-4.223-4.509-11.918-6.652-10.812-5.859 0.354 0.222 5.148 2.827 9.668 6.777 0.73 0.639 1.779-0.236 1.144-0.918z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m273.03 225.592c0.144 6.265-5.76 22.248-7.992 21.673-2.52-0.576 0.504-5.257 2.809-13.177 0.936-3.312 1.655-11.447 1.943-11.735 0.936-0.936 3.24 1.728 3.24 3.239z"/>
+   <path fill="#050505" d="m272.846 226.116c0.103 6.082-5.638 21.594-7.797 21.018-2.422-0.567 0.548-5.146 2.814-12.928 0.899-3.178 1.595-10.947 1.887-11.25 0.914-0.927 3.147 1.527 3.096 3.16z"/>
+   <path fill="#0a0a0a" d="m272.662 226.637c0.063 5.902-5.514 20.939-7.601 20.363-2.323-0.558 0.592-5.035 2.82-12.681 0.861-3.041 1.534-10.446 1.83-10.761 0.89-0.917 3.054 1.327 2.951 3.079z"/>
+   <path fill="#0f0f0f" d="m272.478 227.159c0.021 5.721-5.392 20.284-7.405 19.711-2.224-0.55 0.635-4.927 2.827-12.434 0.824-2.907 1.473-9.945 1.773-10.273 0.866-0.911 2.959 1.125 2.805 2.996z"/>
+   <path fill="#141414" d="m272.294 227.68c-0.02 5.539-5.268 19.63-7.21 19.057-2.125-0.541 0.68-4.816 2.835-12.186 0.786-2.771 1.412-9.445 1.717-9.786 0.84-0.901 2.863 0.924 2.658 2.915z"/>
+   <path fill="#191919" d="m272.11 228.202c-0.063 5.359-5.146 18.977-7.014 18.403-2.027-0.532 0.722-4.706 2.841-11.938 0.748-2.637 1.351-8.944 1.659-9.299 0.818-0.893 2.77 0.722 2.514 2.834z"/>
+   <path fill="#1e1e1e" d="m271.926 228.723c-0.103 5.179-5.021 18.322-6.818 17.75-1.928-0.523 0.766-4.596 2.848-11.691 0.711-2.5 1.29-8.443 1.603-8.811 0.792-0.885 2.674 0.522 2.367 2.752z"/>
+   <path fill="#232323" d="m271.742 229.245c-0.144 4.998-4.9 17.668-6.623 17.096-1.83-0.514 0.811-4.485 2.854-11.442 0.673-2.366 1.229-7.944 1.545-8.325 0.771-0.876 2.583 0.32 2.224 2.671z"/>
+   <path fill="#282828" d="m271.558 229.766c-0.186 4.816-4.777 17.013-6.428 16.443-1.731-0.506 0.854-4.377 2.86-11.196 0.636-2.231 1.168-7.443 1.488-7.837 0.749-0.866 2.49 0.119 2.08 2.59z"/>
+   <path fill="#2d2d2d" d="m271.374 230.288c-0.226 4.637-4.653 16.359-6.231 15.789-1.632-0.496 0.896-4.266 2.866-10.947 0.6-2.098 1.107-6.943 1.433-7.351 0.722-0.859 2.393-0.081 1.932 2.509z"/>
+   <path fill="#333" d="m271.19 230.809c-0.268 4.456-4.531 15.705-6.036 15.136-1.534-0.489 0.94-4.155 2.873-10.7 0.561-1.961 1.046-6.443 1.375-6.863 0.7-0.848 2.3-0.282 1.788 2.427z"/>
+   <path fill="#383838" d="m271.006 231.331c-0.308 4.275-4.407 15.051-5.841 14.482-1.435-0.48 0.984-4.046 2.88-10.453 0.524-1.826 0.985-5.941 1.318-6.375 0.676-0.84 2.206-0.483 1.643 2.346z"/>
+   <path fill="#3d3d3d" d="m270.822 231.853c-0.35 4.093-4.285 14.396-5.645 13.828-1.338-0.472 1.027-3.937 2.886-10.206 0.485-1.691 0.924-5.441 1.261-5.887 0.653-0.832 2.113-0.684 1.498 2.265z"/>
+   <path fill="#424242" d="m270.638 232.374c-0.392 3.914-4.162 13.742-5.45 13.176-1.238-0.463 1.072-3.826 2.893-9.959 0.449-1.555 0.863-4.94 1.204-5.399 0.629-0.824 2.019-0.886 1.353 2.182z"/>
+   <path fill="#474747" d="m270.454 232.896c-0.432 3.731-4.039 13.087-5.254 12.521-1.14-0.453 1.115-3.715 2.9-9.711 0.411-1.42 0.802-4.439 1.146-4.912 0.606-0.815 1.925-1.086 1.208 2.102z"/>
+   <path fill="#4c4c4c" d="m270.27 233.417c-0.474 3.553-3.916 12.434-5.06 11.869-1.041-0.445 1.159-3.606 2.907-9.463 0.373-1.287 0.741-3.941 1.089-4.427 0.583-0.806 1.832-1.287 1.064 2.021z"/>
+   <path fill="#515151" d="m270.086 233.939c-0.514 3.37-3.793 11.778-4.862 11.214-0.942-0.436 1.201-3.496 2.913-9.216 0.336-1.151 0.68-3.438 1.032-3.938 0.558-0.797 1.736-1.489 0.917 1.94z"/>
+   <path fill="#565656" d="m269.902 234.461c-0.555 3.188-3.671 11.123-4.667 10.56-0.844-0.429 1.246-3.386 2.919-8.968 0.298-1.016 0.619-2.939 0.976-3.451 0.535-0.788 1.643-1.689 0.772 1.859z"/>
+   <path fill="#5b5b5b" d="m269.718 234.982c-0.597 3.009-3.548 10.47-4.472 9.907-0.745-0.42 1.29-3.275 2.926-8.721 0.262-0.881 0.559-2.438 0.919-2.963 0.511-0.781 1.549-1.89 0.627 1.777z"/>
+   <path fill="#606060" d="m269.534 235.504c-0.638 2.828-3.425 9.814-4.276 9.252-0.646-0.409 1.333-3.166 2.933-8.473 0.224-0.746 0.497-1.938 0.862-2.476 0.487-0.769 1.454-2.09 0.481 1.697z"/>
+   <path fill="#666" d="m269.35 236.025c-0.68 2.647-3.303 9.161-4.081 8.599-0.548-0.4 1.377-3.056 2.938-8.225 0.187-0.611 0.437-1.438 0.806-1.988 0.464-0.763 1.361-2.293 0.337 1.614z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m251.07 187.865c-1.537 1.622-2.903 9.991 0.938 12.893 3.844 2.818 10.59-2.391 10.59-5.379-0.086-6.746-9.991-9.222-11.528-7.514z"/>
+   <path fill="#010101" d="m251.207 188.006c-1.559 1.611-2.876 9.823 0.857 12.667 3.731 2.764 10.349-2.273 10.384-5.279-0.047-6.576-9.681-9.083-11.241-7.388z"/>
+   <path fill="#030303" d="m251.344 188.146c-1.582 1.601-2.85 9.653 0.774 12.438 3.62 2.709 10.109-2.154 10.178-5.177-0.007-6.404-9.37-8.943-10.952-7.261z"/>
+   <path fill="#050505" d="m251.481 188.287c-1.604 1.589-2.823 9.484 0.691 12.211 3.511 2.653 9.869-2.037 9.975-5.078 0.031-6.232-9.061-8.802-10.666-7.133z"/>
+   <path fill="#070707" d="m251.617 188.427c-1.626 1.579-2.795 9.316 0.611 11.984 3.397 2.6 9.629-1.918 9.768-4.976 0.071-6.062-8.751-8.664-10.379-7.008z"/>
+   <path fill="#090909" d="m251.754 188.567c-1.648 1.568-2.768 9.146 0.529 11.758 3.287 2.543 9.389-1.802 9.563-4.875 0.109-5.892-8.441-8.525-10.092-6.883z"/>
+   <path fill="#0b0b0b" d="m251.891 188.708c-1.671 1.557-2.741 8.978 0.445 11.529 3.177 2.489 9.15-1.683 9.358-4.774 0.15-5.72-8.13-8.385-9.803-6.755z"/>
+   <path fill="#0d0d0d" d="m252.028 188.848c-1.694 1.546-2.715 8.809 0.364 11.302 3.064 2.435 8.908-1.565 9.152-4.673 0.189-5.549-7.82-8.245-9.516-6.629z"/>
+   <path fill="#0f0f0f" d="m252.165 188.989c-1.716 1.535-2.688 8.64 0.282 11.074 2.953 2.38 8.669-1.447 8.948-4.572 0.226-5.378-7.512-8.106-9.23-6.502z"/>
+   <path fill="#111" d="m252.301 189.129c-1.737 1.524-2.659 8.471 0.2 10.847 2.844 2.325 8.431-1.33 8.743-4.471 0.266-5.207-7.201-7.966-8.943-6.376z"/>
+   <path fill="#131313" d="m252.438 189.269c-1.76 1.514-2.633 8.304 0.118 10.619 2.73 2.271 8.189-1.212 8.538-4.369 0.305-5.036-6.892-7.827-8.656-6.25z"/>
+   <path fill="#151515" d="m252.575 189.41c-1.783 1.503-2.606 8.133 0.036 10.391 2.62 2.216 7.949-1.094 8.332-4.268 0.344-4.865-6.581-7.687-8.368-6.123z"/>
+   <path fill="#161616" d="m252.712 189.55c-1.805 1.492-2.58 7.965-0.046 10.164 2.508 2.162 7.709-0.975 8.127-4.167 0.383-4.694-6.272-7.548-8.081-5.997z"/>
+   <path fill="#181818" d="m252.849 189.691c-1.828 1.481-2.554 7.796-0.129 9.937 2.397 2.105 7.47-0.857 7.922-4.066 0.423-4.524-5.961-7.409-7.793-5.871z"/>
+   <path fill="#1a1a1a" d="m252.985 189.831c-1.85 1.47-2.525 7.626-0.21 9.708 2.286 2.053 7.229-0.74 7.717-3.964 0.461-4.352-5.652-7.269-7.507-5.744z"/>
+   <path fill="#1c1c1c" d="m253.122 189.971c-1.872 1.46-2.499 7.459-0.292 9.482 2.175 1.996 6.989-0.623 7.511-3.865 0.501-4.18-5.341-7.128-7.219-5.617z"/>
+   <path fill="#1e1e1e" d="m253.259 190.112c-1.895 1.448-2.472 7.289-0.375 9.254 2.064 1.942 6.75-0.504 7.308-3.763 0.539-4.01-5.033-6.99-6.933-5.491z"/>
+   <path fill="#202020" d="m253.396 190.252c-1.917 1.438-2.445 7.122-0.457 9.027 1.953 1.888 6.51-0.386 7.102-3.662 0.578-3.839-4.722-6.85-6.645-5.365z"/>
+   <path fill="#222" d="m253.533 190.393c-1.939 1.426-2.418 6.951-0.539 8.799 1.841 1.832 6.271-0.268 6.896-3.561 0.618-3.668-4.412-6.711-6.357-5.238z"/>
+   <path fill="#242424" d="m253.669 190.533c-1.961 1.416-2.391 6.783-0.621 8.572 1.731 1.776 6.03-0.149 6.692-3.46 0.657-3.497-4.102-6.571-6.071-5.112z"/>
+   <path fill="#262626" d="m253.806 190.673c-1.984 1.405-2.364 6.615-0.703 8.344 1.619 1.724 5.79-0.032 6.485-3.358 0.697-3.326-3.791-6.432-5.782-4.986z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m250.71 256.698c1.513 1.512 2.809-2.232 4.32-3.457 1.512-1.224 3.96-3.888 8.856-3.888s4.535-0.144 4.319-2.017c-0.144-1.799-1.584-1.655-5.903-1.008-4.32 0.576-7.2 2.809-8.929 4.824-1.654 1.945-3.527 4.681-2.663 5.546z"/>
+   <path fill="#050505" d="m251.043 256.331c1.459 1.449 2.703-2.121 4.205-3.308 1.501-1.187 3.931-3.731 8.64-3.731 4.71-0.002 4.415-0.129 4.209-1.94-0.139-1.743-1.543-1.593-5.749-0.979-4.207 0.543-7.029 2.703-8.712 4.648-1.616 1.877-3.438 4.474-2.593 5.31z"/>
+   <path fill="#0a0a0a" d="m251.376 255.961c1.406 1.389 2.6-2.008 4.089-3.156 1.491-1.148 3.901-3.576 8.425-3.577 4.521-0.001 4.293-0.11 4.096-1.862-0.132-1.688-1.501-1.531-5.594-0.951-4.093 0.51-6.857 2.596-8.495 4.471-1.575 1.812-3.348 4.271-2.521 5.075z"/>
+   <path fill="#0f0f0f" d="m251.709 255.594c1.354 1.326 2.494-1.895 3.975-3.008 1.479-1.111 3.871-3.42 8.207-3.422s4.171-0.094 3.984-1.785c-0.126-1.631-1.46-1.467-5.438-0.924-3.979 0.479-6.687 2.492-8.28 4.297-1.533 1.747-3.257 4.066-2.448 4.842z"/>
+   <path fill="#141414" d="m252.042 255.226c1.302 1.265 2.39-1.783 3.858-2.856 1.47-1.076 3.842-3.266 7.991-3.268s4.05-0.077 3.873-1.709c-0.119-1.575-1.419-1.404-5.284-0.895-3.865 0.444-6.515 2.385-8.063 4.121-1.49 1.678-3.165 3.861-2.375 4.607z"/>
+   <path fill="#191919" d="m252.374 254.859c1.249 1.202 2.285-1.671 3.744-2.708 1.458-1.037 3.813-3.109 7.774-3.111 3.963-0.004 3.929-0.061 3.761-1.633-0.113-1.519-1.377-1.341-5.128-0.867-3.751 0.414-6.344 2.279-7.847 3.945-1.449 1.613-3.075 3.656-2.304 4.374z"/>
+   <path fill="#1e1e1e" d="m252.707 254.491c1.196 1.141 2.182-1.559 3.628-2.558 1.448-1 3.783-2.954 7.56-2.957 3.775-0.003 3.806-0.043 3.648-1.556-0.106-1.461-1.336-1.277-4.974-0.838-3.637 0.379-6.172 2.174-7.63 3.77-1.408 1.546-2.984 3.451-2.232 4.139z"/>
+   <path fill="#232323" d="m253.04 254.124c1.144 1.078 2.076-1.447 3.514-2.41 1.437-0.961 3.753-2.797 7.342-2.799 3.589-0.004 3.685-0.027 3.537-1.48-0.101-1.405-1.294-1.215-4.818-0.811-3.524 0.349-6.001 2.068-7.415 3.594-1.367 1.48-2.894 3.245-2.16 3.906z"/>
+   <path fill="#282828" d="m253.373 253.754c1.09 1.018 1.972-1.334 3.398-2.258 1.426-0.926 3.723-2.642 7.125-2.646 3.402-0.005 3.563-0.011 3.426-1.403-0.095-1.349-1.253-1.15-4.664-0.781-3.409 0.314-5.829 1.961-7.198 3.418-1.325 1.415-2.803 3.041-2.087 3.67z"/>
+   <path fill="#2d2d2d" d="m253.706 253.388c1.038 0.954 1.866-1.222 3.282-2.11 1.416-0.887 3.694-2.486 6.909-2.49 3.217-0.004 3.441 0.008 3.313-1.326-0.088-1.293-1.212-1.088-4.508-0.754-3.296 0.283-5.658 1.857-6.981 3.244-1.284 1.345-2.712 2.836-2.015 3.436z"/>
+   <path fill="#333" d="m254.039 253.02c0.985 0.893 1.762-1.109 3.167-1.96s3.664-2.33 6.693-2.335c3.029-0.006 3.32 0.023 3.202-1.249-0.082-1.237-1.171-1.024-4.354-0.726-3.182 0.25-5.485 1.75-6.765 3.066-1.243 1.282-2.622 2.634-1.943 3.204z"/>
+   <path fill="#383838" d="m254.372 252.652c0.933 0.831 1.657-0.998 3.051-1.81 1.396-0.813 3.636-2.174 6.478-2.18 2.843-0.006 3.199 0.039 3.09-1.172-0.076-1.181-1.129-0.963-4.198-0.697-3.068 0.217-5.314 1.644-6.55 2.891-1.202 1.214-2.531 2.427-1.871 2.968z"/>
+   <path fill="#3d3d3d" d="m254.704 252.284c0.88 0.771 1.553-0.885 2.938-1.66 1.383-0.775 3.604-2.019 6.26-2.024 2.656-0.007 3.078 0.058 2.979-1.095-0.069-1.125-1.088-0.899-4.044-0.67-2.954 0.185-5.144 1.539-6.333 2.715-1.16 1.148-2.441 2.222-1.8 2.734z"/>
+   <path fill="#424242" d="m255.037 251.917c0.827 0.707 1.448-0.773 2.821-1.51 1.373-0.738 3.576-1.863 6.044-1.871 2.47-0.007 2.956 0.074 2.867-1.018-0.063-1.068-1.046-0.836-3.889-0.641-2.841 0.151-4.973 1.433-6.116 2.539-1.119 1.083-2.35 2.018-1.727 2.501z"/>
+   <path fill="#474747" d="m255.37 251.549c0.774 0.645 1.344-0.661 2.706-1.362 1.362-0.7 3.545-1.706 5.828-1.713 2.283-0.009 2.834 0.09 2.754-0.942-0.057-1.012-1.005-0.773-3.733-0.613-2.727 0.119-4.801 1.328-5.899 2.365-1.078 1.013-2.26 1.81-1.656 2.265z"/>
+   <path fill="#4c4c4c" d="m255.703 251.181c0.721 0.584 1.239-0.55 2.59-1.212 1.353-0.663 3.517-1.551 5.612-1.559 2.096-0.009 2.713 0.107 2.643-0.865-0.051-0.955-0.964-0.709-3.577-0.584-2.613 0.086-4.631 1.222-5.686 2.188-1.035 0.949-2.168 1.607-1.582 2.032z"/>
+   <path fill="#515151" d="m256.036 250.813c0.669 0.521 1.134-0.436 2.476-1.063 1.341-0.625 3.485-1.395 5.395-1.402 1.91-0.01 2.591 0.124 2.531-0.789-0.044-0.898-0.922-0.646-3.423-0.557-2.499 0.055-4.458 1.117-5.469 2.014-0.994 0.882-2.077 1.402-1.51 1.797z"/>
+   <path fill="#565656" d="m256.369 250.446c0.616 0.459 1.029-0.324 2.36-0.912 1.33-0.589 3.456-1.24 5.178-1.248 1.723-0.01 2.47 0.141 2.42-0.713-0.039-0.842-0.881-0.582-3.268-0.527-2.387 0.021-4.287 1.01-5.252 1.836-0.953 0.816-1.987 1.199-1.438 1.564z"/>
+   <path fill="#5b5b5b" d="m256.701 250.079c0.564 0.397 0.926-0.213 2.245-0.764s3.427-1.084 4.963-1.093c1.536-0.011 2.348 0.157 2.307-0.636-0.031-0.785-0.839-0.52-3.112-0.5-2.271-0.01-4.116 0.906-5.035 1.662-0.913 0.751-1.898 0.993-1.368 1.331z"/>
+   <path fill="#606060" d="m257.034 249.709c0.511 0.336 0.821-0.1 2.13-0.612 1.309-0.515 3.397-0.929 4.746-0.938 1.351-0.01 2.227 0.176 2.196-0.558-0.026-0.729-0.799-0.457-2.958-0.472-2.158-0.043-3.945 0.799-4.82 1.486-0.87 0.682-1.805 0.788-1.294 1.094z"/>
+   <path fill="#666" d="m257.367 249.342c0.458 0.273 0.716 0.012 2.014-0.465 1.299-0.476 3.368-0.771 4.53-0.781 1.163-0.012 2.105 0.191 2.084-0.482-0.02-0.673-0.757-0.393-2.803-0.443-2.044-0.076-3.773 0.693-4.604 1.311-0.828 0.616-1.714 0.582-1.221 0.86z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m270.222 247.265c0 2.304 4.68 3.096 9.144 3.743 4.392 0.648 7.92 1.513 8.136 6.121 0.216 4.535-0.936 7.775 1.08 7.416 4.32-0.793 5.904-5.473 5.832-7.633 0-2.16-3.168-6.047-8.855-8.207-4.177-1.584-7.2-2.305-10.872-2.449-4.897-0.214-4.465 1.009-4.465 1.009z"/>
+   <path fill="#030303" d="m270.348 247.304c0.012 2.239 4.643 2.97 9.049 3.639 4.352 0.675 7.75 1.511 8.11 6.002 0.345 4.415-0.854 7.515 1.136 7.188 4.145-0.739 5.688-5.2 5.607-7.332-0.015-2.151-3.118-5.91-8.733-8.038-4.129-1.563-7.11-2.298-10.74-2.452-4.754-0.217-4.438 0.952-4.429 0.993z"/>
+   <path fill="#070707" d="m270.474 247.342c0.023 2.174 4.605 2.845 8.953 3.533 4.312 0.701 7.58 1.508 8.087 5.885 0.471 4.295-0.771 7.252 1.189 6.963 3.97-0.689 5.472-4.93 5.384-7.033-0.028-2.145-3.068-5.773-8.61-7.87-4.082-1.543-7.022-2.291-10.609-2.456-4.612-0.218-4.412 0.896-4.394 0.978z"/>
+   <path fill="#0b0b0b" d="m270.6 247.379c0.035 2.109 4.568 2.721 8.857 3.431 4.271 0.728 7.411 1.506 8.063 5.767 0.599 4.174-0.689 6.988 1.245 6.735 3.795-0.638 5.257-4.66 5.159-6.733-0.044-2.137-3.019-5.636-8.488-7.701-4.035-1.522-6.933-2.285-10.478-2.459-4.469-0.219-4.384 0.837-4.358 0.96z"/>
+   <path fill="#0f0f0f" d="m270.726 247.418c0.047 2.043 4.531 2.595 8.762 3.324 4.232 0.754 7.242 1.504 8.039 5.649 0.725 4.052-0.608 6.728 1.299 6.509 3.621-0.586 5.041-4.389 4.937-6.436-0.06-2.127-2.971-5.496-8.367-7.53-3.988-1.502-6.842-2.278-10.346-2.464-4.328-0.22-4.359 0.784-4.324 0.948z"/>
+   <path fill="#131313" d="m270.852 247.458c0.059 1.978 4.495 2.469 8.667 3.219 4.19 0.781 7.071 1.502 8.014 5.531 0.854 3.932-0.526 6.465 1.354 6.283 3.445-0.535 4.824-4.119 4.712-6.137-0.074-2.119-2.92-5.359-8.245-7.361-3.941-1.482-6.753-2.271-10.213-2.469-4.186-0.221-4.333 0.726-4.289 0.934z"/>
+   <path fill="#161616" d="m270.978 247.495c0.07 1.914 4.458 2.344 8.57 3.115 4.151 0.807 6.903 1.5 7.99 5.413 0.98 3.812-0.443 6.202 1.409 6.056 3.271-0.482 4.609-3.848 4.488-5.836-0.088-2.111-2.871-5.222-8.123-7.193-3.894-1.461-6.663-2.264-10.081-2.471-4.043-0.223-4.306 0.67-4.253 0.916z"/>
+   <path fill="#1a1a1a" d="m271.104 247.534c0.082 1.848 4.422 2.219 8.476 3.01 4.111 0.832 6.734 1.498 7.965 5.295 1.108 3.69-0.36 5.94 1.464 5.83 3.097-0.433 4.394-3.578 4.265-5.537-0.104-2.104-2.821-5.084-8-7.023-3.848-1.441-6.575-2.26-9.949-2.477-3.905-0.223-4.283 0.613-4.221 0.902z"/>
+   <path fill="#1e1e1e" d="m271.23 247.573c0.094 1.781 4.385 2.092 8.381 2.904 4.07 0.859 6.563 1.495 7.939 5.178 1.236 3.568-0.278 5.678 1.52 5.602 2.921-0.381 4.177-3.305 4.04-5.237-0.118-2.097-2.771-4.946-7.878-6.854-3.8-1.42-6.485-2.252-9.817-2.479-3.762-0.226-4.256 0.556-4.185 0.886z"/>
+   <path fill="#222" d="m271.356 247.61c0.105 1.717 4.348 1.969 8.285 2.801 4.029 0.885 6.395 1.493 7.916 5.059 1.362 3.449-0.197 5.416 1.573 5.377 2.746-0.329 3.962-3.036 3.816-4.939-0.133-2.087-2.722-4.808-7.756-6.684-3.753-1.4-6.396-2.247-9.686-2.484-3.618-0.227-4.227 0.499-4.148 0.87z"/>
+   <path fill="#262626" d="m271.482 247.648c0.118 1.651 4.311 1.843 8.189 2.694 3.99 0.914 6.226 1.492 7.892 4.943 1.491 3.328-0.115 5.152 1.629 5.149 2.571-0.278 3.746-2.765 3.592-4.64-0.146-2.08-2.672-4.672-7.634-6.516-3.705-1.38-6.306-2.24-9.553-2.488-3.478-0.225-4.203 0.446-4.115 0.858z"/>
+   <path fill="#2a2a2a" d="m271.608 247.687c0.129 1.587 4.273 1.716 8.094 2.59 3.95 0.938 6.056 1.489 7.867 4.825 1.618 3.206-0.033 4.891 1.684 4.922 2.396-0.227 3.53-2.494 3.368-4.34-0.162-2.072-2.623-4.534-7.512-6.348-3.658-1.358-6.216-2.232-9.421-2.492-3.336-0.226-4.177 0.39-4.08 0.843z"/>
+   <path fill="#2d2d2d" d="m271.734 247.725c0.141 1.521 4.237 1.591 7.999 2.484 3.909 0.967 5.886 1.488 7.842 4.707 1.746 3.086 0.05 4.629 1.739 4.697 2.221-0.176 3.313-2.225 3.144-4.041-0.177-2.064-2.572-4.396-7.389-6.178-3.612-1.339-6.128-2.227-9.29-2.497-3.194-0.227-4.151 0.334-4.045 0.828z"/>
+   <path fill="#313131" d="m271.86 247.763c0.153 1.456 4.2 1.466 7.903 2.381 3.869 0.991 5.717 1.485 7.817 4.589 1.873 2.965 0.132 4.365 1.794 4.469 2.046-0.123 3.099-1.953 2.92-3.742-0.191-2.055-2.523-4.258-7.267-6.008-3.565-1.318-6.038-2.22-9.158-2.5-3.051-0.229-4.124 0.276-4.009 0.811z"/>
+   <path fill="#353535" d="m271.986 247.801c0.165 1.392 4.163 1.341 7.808 2.275 3.829 1.018 5.547 1.483 7.794 4.473 2 2.843 0.213 4.103 1.848 4.242 1.873-0.074 2.883-1.683 2.696-3.443-0.206-2.047-2.474-4.12-7.145-5.838-3.517-1.299-5.948-2.215-9.026-2.506-2.91-0.229-4.099 0.221-3.975 0.797z"/>
+   <path fill="#393939" d="m272.112 247.84c0.176 1.326 4.126 1.215 7.712 2.17 3.789 1.045 5.378 1.482 7.771 4.354 2.127 2.723 0.295 3.842 1.901 4.016 1.698-0.021 2.667-1.412 2.474-3.144-0.222-2.038-2.426-3.981-7.023-5.669-3.47-1.277-5.859-2.208-8.894-2.509-2.769-0.231-4.074 0.164-3.941 0.782z"/>
+   <path fill="#3d3d3d" d="m272.238 247.877c0.188 1.262 4.089 1.09 7.617 2.066 3.749 1.071 5.208 1.479 7.745 4.236 2.255 2.602 0.377 3.578 1.957 3.789 1.522 0.029 2.451-1.141 2.249-2.844-0.236-2.033-2.375-3.846-6.901-5.5-3.423-1.258-5.769-2.203-8.762-2.514-2.626-0.231-4.046 0.109-3.905 0.767z"/>
+   <path fill="#414141" d="m272.364 247.917c0.2 1.195 4.052 0.965 7.522 1.961 3.708 1.098 5.037 1.477 7.72 4.119 2.383 2.479 0.46 3.315 2.012 3.562 1.348 0.081 2.236-0.87 2.025-2.545-0.251-2.022-2.325-3.707-6.778-5.331-3.377-1.237-5.681-2.195-8.631-2.518-2.485-0.233-4.02 0.05-3.87 0.752z"/>
+   <path fill="#444" d="m272.49 247.956c0.212 1.129 4.015 0.838 7.426 1.855 3.668 1.124 4.869 1.475 7.696 4 2.51 2.359 0.542 3.055 2.067 3.336 1.173 0.133 2.02-0.6 1.801-2.246-0.266-2.016-2.276-3.568-6.656-5.16-3.329-1.218-5.591-2.189-8.499-2.521-2.343-0.235-3.994-0.007-3.835 0.736z"/>
+   <path fill="#484848" d="m272.616 247.993c0.223 1.065 3.979 0.715 7.331 1.752 3.628 1.15 4.699 1.473 7.671 3.883 2.638 2.238 0.624 2.791 2.122 3.108 0.998 0.185 1.804-0.329 1.577-1.946-0.28-2.008-2.227-3.432-6.534-4.992-3.282-1.196-5.501-2.182-8.367-2.525-2.201-0.235-3.968-0.064-3.8 0.72z"/>
+   <path fill="#4c4c4c" d="m272.742 248.032c0.235 1 3.941 0.588 7.235 1.645 3.588 1.178 4.529 1.472 7.646 3.766 2.766 2.118 0.706 2.529 2.177 2.883 0.823 0.235 1.589-0.059 1.354-1.648-0.295-1.998-2.177-3.293-6.412-4.822-3.235-1.176-5.412-2.176-8.235-2.529-2.059-0.239-3.942-0.119-3.765 0.705z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#4c4c4c" d="m287.565 252.854c1.646 1 1.353 2.059 2.412 2.766 0.528 0.352 1.412 0.352 0.882-1-0.706-1.588-1.294-2.472-4.941-3.943-2.353-0.941-1.882 0.059 1.647 2.177z"/>
+   <path fill="#505050" d="m287.609 252.868c1.605 0.975 1.32 2.008 2.353 2.696 0.517 0.343 1.377 0.343 0.86-0.976-0.689-1.549-1.262-2.41-4.82-3.846-2.295-0.917-1.836 0.059 1.607 2.126z"/>
+   <path fill="#545454" d="m287.652 252.879c1.567 0.951 1.287 1.957 2.294 2.629 0.503 0.334 1.343 0.334 0.839-0.951-0.671-1.51-1.23-2.35-4.699-3.749-2.238-0.893-1.79 0.058 1.566 2.071z"/>
+   <path fill="#575757" d="m287.696 252.891c1.526 0.926 1.254 1.908 2.235 2.563 0.489 0.325 1.308 0.325 0.816-0.928-0.653-1.471-1.199-2.289-4.578-3.652-2.179-0.872-1.743 0.055 1.527 2.017z"/>
+   <path fill="#5b5b5b" d="m287.74 252.903c1.485 0.902 1.22 1.857 2.175 2.494 0.479 0.318 1.274 0.318 0.796-0.902-0.637-1.432-1.167-2.229-4.457-3.556-2.122-0.849-1.697 0.054 1.486 1.964z"/>
+   <path fill="#5f5f5f" d="m287.783 252.915c1.446 0.879 1.188 1.808 2.117 2.426 0.464 0.31 1.239 0.31 0.773-0.877-0.619-1.394-1.136-2.168-4.336-3.459-2.064-0.826-1.65 0.052 1.446 1.91z"/>
+   <path fill="#636363" d="m287.827 252.926c1.405 0.854 1.154 1.758 2.057 2.359 0.452 0.301 1.205 0.301 0.754-0.853-0.603-1.354-1.104-2.108-4.216-3.363-2.007-0.801-1.605 0.053 1.405 1.857z"/>
+   <path fill="#676767" d="m287.871 252.94c1.364 0.828 1.121 1.705 1.998 2.29 0.438 0.292 1.17 0.292 0.731-0.828-0.585-1.315-1.072-2.047-4.095-3.267-1.948-0.779-1.558 0.05 1.366 1.805z"/>
+   <path fill="#6b6b6b" d="m287.914 252.952c1.325 0.805 1.088 1.655 1.94 2.223 0.425 0.283 1.135 0.283 0.709-0.803-0.568-1.277-1.041-1.988-3.974-3.17-1.891-0.757-1.512 0.047 1.325 1.75z"/>
+   <path fill="#6e6e6e" d="m287.958 252.963c1.284 0.779 1.056 1.605 1.88 2.156 0.413 0.274 1.102 0.274 0.688-0.779-0.551-1.238-1.009-1.926-3.853-3.073-1.833-0.733-1.466 0.046 1.285 1.696z"/>
+   <path fill="#727272" d="m288.002 252.976c1.243 0.755 1.021 1.554 1.821 2.087 0.399 0.266 1.066 0.266 0.666-0.755-0.533-1.199-0.977-1.865-3.731-2.976-1.776-0.71-1.421 0.045 1.244 1.644z"/>
+   <path fill="#767676" d="m288.045 252.989c1.203 0.73 0.989 1.504 1.763 2.02 0.387 0.257 1.031 0.257 0.645-0.731-0.516-1.159-0.946-1.805-3.61-2.879-1.72-0.688-1.376 0.042 1.202 1.59z"/>
+   <path fill="#7a7a7a" d="m288.089 253c1.163 0.705 0.955 1.453 1.703 1.951 0.373 0.25 0.997 0.25 0.623-0.705-0.499-1.121-0.914-1.744-3.489-2.783-1.661-0.664-1.329 0.041 1.163 1.537z"/>
+   <path fill="#7e7e7e" d="m288.133 253.012c1.122 0.682 0.923 1.404 1.644 1.885 0.361 0.24 0.962 0.24 0.602-0.682-0.481-1.082-0.882-1.684-3.367-2.687-1.605-0.64-1.285 0.041 1.121 1.484z"/>
+   <path fill="#828282" d="m288.176 253.025c1.082 0.657 0.89 1.353 1.586 1.815 0.348 0.232 0.927 0.232 0.578-0.656-0.463-1.043-0.85-1.623-3.245-2.59-1.547-0.618-1.237 0.039 1.081 1.431z"/>
+   <path fill="#858585" d="m288.22 253.038c1.042 0.631 0.855 1.301 1.524 1.748 0.335 0.223 0.894 0.223 0.559-0.633-0.446-1.005-0.818-1.563-3.125-2.492-1.488-0.596-1.19 0.037 1.042 1.377z"/>
+   <path fill="#898989" d="m288.264 253.049c1.001 0.607 0.821 1.252 1.466 1.681 0.322 0.214 0.857 0.214 0.536-0.608-0.43-0.965-0.786-1.502-3.004-2.396-1.43-0.573-1.144 0.034 1.002 1.323z"/>
+   <path fill="#8d8d8d" d="m288.307 253.061c0.961 0.584 0.79 1.201 1.407 1.613 0.309 0.205 0.823 0.205 0.515-0.584-0.412-0.926-0.755-1.441-2.883-2.299-1.373-0.548-1.098 0.034 0.961 1.27z"/>
+   <path fill="#919191" d="m288.351 253.073c0.921 0.559 0.756 1.151 1.348 1.547 0.296 0.196 0.789 0.196 0.493-0.56-0.395-0.888-0.723-1.381-2.762-2.204-1.315-0.525-1.052 0.033 0.921 1.217z"/>
+   <path fill="#959595" d="m288.395 253.084c0.88 0.535 0.723 1.102 1.289 1.479 0.282 0.189 0.754 0.189 0.471-0.534-0.377-0.849-0.691-1.321-2.641-2.106-1.257-0.505-1.006 0.031 0.881 1.161z"/>
+   <path fill="#999" d="m288.438 253.097c0.84 0.51 0.689 1.05 1.229 1.409 0.271 0.181 0.721 0.181 0.45-0.51-0.36-0.81-0.66-1.26-2.52-2.01-1.199-0.48-0.959 0.031 0.841 1.111z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path d="m222.275 107.427c-0.738 0.902 0.574 8.365 5.412 13.285 4.839 4.838 7.791 4.838 9.759 2.706 3.771-4.018 0.738-7.791-1.558-10.415-2.297-2.624-5.248-1.722-7.955-4.346-2.706-2.624-4.592-2.46-5.658-1.23z"/>
+   <path fill="#050505" d="m222.345 107.494c-0.732 0.895 0.569 8.3 5.369 13.182 4.803 4.801 7.731 4.801 9.685 2.685 3.742-3.987 0.731-7.73-1.546-10.334-2.278-2.604-5.208-1.709-7.894-4.312-2.684-2.604-4.556-2.441-5.614-1.221z"/>
+   <path fill="#0a0a0a" d="m222.416 107.561c-0.727 0.888 0.565 8.235 5.328 13.079 4.763 4.763 7.67 4.763 9.607 2.664 3.713-3.956 0.727-7.67-1.534-10.253-2.26-2.584-5.166-1.696-7.831-4.279-2.664-2.583-4.521-2.422-5.57-1.211z"/>
+   <path fill="#0f0f0f" d="m222.486 107.628c-0.721 0.881 0.561 8.17 5.286 12.976 4.726 4.725 7.608 4.725 9.532 2.642 3.684-3.924 0.72-7.609-1.522-10.172-2.243-2.563-5.126-1.682-7.77-4.244-2.643-2.563-4.485-2.403-5.526-1.202z"/>
+   <path fill="#141414" d="m222.556 107.695c-0.716 0.874 0.557 8.105 5.243 12.872 4.689 4.688 7.55 4.688 9.456 2.622 3.655-3.893 0.716-7.549-1.51-10.091-2.224-2.543-5.085-1.669-7.707-4.211-2.621-2.543-4.449-2.384-5.482-1.192z"/>
+   <path fill="#191919" d="m222.627 107.762c-0.71 0.867 0.552 8.04 5.202 12.769 4.65 4.65 7.488 4.65 9.379 2.601 3.626-3.862 0.71-7.489-1.497-10.011s-5.044-1.655-7.646-4.177-4.414-2.364-5.438-1.182z"/>
+   <path fill="#1e1e1e" d="m222.697 107.829c-0.704 0.86 0.547 7.975 5.16 12.666 4.613 4.612 7.428 4.612 9.304 2.579 3.596-3.83 0.703-7.427-1.486-9.929-2.188-2.502-5.003-1.642-7.584-4.143-2.579-2.502-4.378-2.346-5.394-1.173z"/>
+   <path fill="#232323" d="m222.767 107.896c-0.697 0.853 0.543 7.91 5.117 12.562 4.576 4.575 7.367 4.575 9.229 2.559 3.567-3.8 0.698-7.367-1.473-9.848-2.171-2.482-4.963-1.629-7.522-4.11s-4.343-2.326-5.351-1.163z"/>
+   <path fill="#282828" d="m222.838 107.963c-0.691 0.846 0.538 7.845 5.076 12.459 4.537 4.537 7.307 4.537 9.152 2.538 3.537-3.769 0.691-7.307-1.461-9.768-2.154-2.461-4.922-1.615-7.461-4.076-2.538-2.461-4.307-2.307-5.306-1.153z"/>
+   <path fill="#2d2d2d" d="m222.908 108.03c-0.686 0.839 0.534 7.78 5.034 12.355 4.5 4.499 7.246 4.499 9.076 2.516 3.509-3.737 0.686-7.246-1.449-9.686-2.135-2.441-4.881-1.602-7.399-4.042-2.516-2.44-4.271-2.287-5.262-1.143z"/>
+   <path fill="#333" d="m222.978 108.096c-0.681 0.832 0.529 7.715 4.992 12.253 4.463 4.462 7.186 4.462 9.001 2.496 3.479-3.706 0.68-7.186-1.438-9.605-2.118-2.42-4.841-1.588-7.337-4.008s-4.235-2.27-5.218-1.136z"/>
+   <path fill="#383838" d="m223.048 108.163c-0.674 0.825 0.526 7.65 4.95 12.15 4.425 4.425 7.125 4.425 8.925 2.475 3.45-3.675 0.676-7.125-1.425-9.525-2.099-2.4-4.8-1.575-7.274-3.975-2.475-2.399-4.201-2.25-5.176-1.125z"/>
+   <path fill="#3d3d3d" d="m223.119 108.23c-0.669 0.818 0.521 7.585 4.908 12.047 4.387 4.387 7.063 4.387 8.849 2.453 3.42-3.643 0.669-7.064-1.413-9.443-2.082-2.38-4.759-1.562-7.214-3.941-2.453-2.38-4.164-2.231-5.13-1.116z"/>
+   <path fill="#424242" d="m223.189 108.297c-0.663 0.811 0.516 7.52 4.866 11.944 4.35 4.349 7.004 4.349 8.772 2.432 3.392-3.612 0.663-7.004-1.4-9.363-2.064-2.359-4.719-1.548-7.151-3.907-2.433-2.359-4.129-2.212-5.087-1.106z"/>
+   <path fill="#474747" d="m223.259 108.364c-0.656 0.804 0.513 7.455 4.824 11.84 4.313 4.312 6.944 4.312 8.697 2.412 3.362-3.582 0.658-6.944-1.388-9.282-2.046-2.339-4.679-1.535-7.09-3.874-2.411-2.338-4.093-2.192-5.043-1.096z"/>
+   <path fill="#4c4c4c" d="m223.33 108.431c-0.651 0.797 0.507 7.39 4.782 11.737 4.274 4.274 6.882 4.274 8.621 2.39 3.332-3.55 0.651-6.883-1.377-9.201s-4.636-1.521-7.028-3.839c-2.39-2.318-4.057-2.174-4.998-1.087z"/>
+   <path fill="#515151" d="m223.4 108.498c-0.646 0.79 0.503 7.325 4.74 11.634 4.236 4.236 6.821 4.236 8.545 2.369 3.304-3.519 0.646-6.822-1.364-9.12s-4.596-1.508-6.966-3.806c-2.369-2.298-4.022-2.154-4.955-1.077z"/>
+   <path fill="#565656" d="m223.47 108.565c-0.641 0.783 0.499 7.26 4.697 11.53 4.199 4.199 6.763 4.199 8.471 2.349 3.273-3.488 0.64-6.762-1.353-9.039-1.993-2.278-4.556-1.495-6.905-3.773-2.347-2.277-3.985-2.135-4.91-1.067z"/>
+   <path fill="#5b5b5b" d="m223.541 108.632c-0.635 0.776 0.493 7.195 4.656 11.427 4.161 4.161 6.701 4.161 8.393 2.327 3.245-3.456 0.636-6.701-1.34-8.958-1.975-2.257-4.514-1.48-6.843-3.738-2.327-2.257-3.95-2.116-4.866-1.058z"/>
+   <path fill="#606060" d="m223.611 108.699c-0.629 0.769 0.489 7.13 4.614 11.324 4.124 4.123 6.64 4.123 8.317 2.306 3.215-3.425 0.628-6.641-1.328-8.877-1.957-2.237-4.474-1.468-6.78-3.705-2.306-2.236-3.915-2.097-4.823-1.048z"/>
+   <path fill="#666" d="m223.681 108.765c-0.623 0.762 0.484 7.065 4.571 11.221 4.086 4.086 6.58 4.086 8.242 2.285 3.187-3.394 0.623-6.58-1.315-8.796-1.939-2.217-4.434-1.455-6.72-3.671-2.284-2.216-3.878-2.078-4.778-1.039z"/>
+  </g>
+  <g transform="translate(-12.4048,10.0005)">
+   <path fill="#fc0" d="m137.79 109.277c1.978 1.366 2.031 1.607 4.948 3.514 4.64 3.768 12.885 4.616 16.922 4.75 9.233 1.467 25.738-7.161 32.273-11.111 3.291-2.463 9.38-7.551 11.659-7.637 1.405 1.485-0.66 1.792-3.587 3.775-3.906 2.779-7.25 5.156-13.172 8.515-6.338 3.316-16.078 8.794-28.548 8.054-6.542-0.959-6.566-1.024-10.606-3.086-2.4-1.732-7.901-4.608-9.889-6.774z"/>
+   <linearGradient id="al" x1="129.342" gradientUnits="userSpaceOnUse" x2="195.598" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.305" y2="259.305">
+    <stop stop-color="#FAC700" offset="0"/>
+    <stop stop-color="#F7C400" offset=".415"/>
+    <stop stop-color="#F7C400" offset="1"/>
+   </linearGradient>
+   <path fill="url(#al)" d="m137.742 109.259c1.926 1.274 2.165 1.643 5.083 3.554 4.616 3.734 12.716 4.616 16.796 4.763 9.365 1.452 26.05-7.294 32.356-11.159 3.357-2.506 9.344-7.498 11.595-7.604 1.365 1.472-0.728 1.768-3.688 3.814-3.889 2.753-7.119 5.065-12.972 8.383-6.29 3.291-16.078 8.795-28.536 8.104-6.561-0.945-6.851-1.07-10.758-3.079-2.468-1.755-7.876-4.587-9.876-6.776z"/>
+   <linearGradient id="am" x1="129.293" gradientUnits="userSpaceOnUse" x2="195.554" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.311" y2="259.311">
+    <stop stop-color="#F6C200" offset="0"/>
+    <stop stop-color="#EFBC00" offset=".415"/>
+    <stop stop-color="#EFBC00" offset="1"/>
+   </linearGradient>
+   <path fill="url(#am)" d="m137.693 109.24c1.876 1.183 2.3 1.68 5.218 3.595 4.593 3.7 12.548 4.616 16.67 4.776 9.498 1.437 26.364-7.428 32.44-11.207 3.425-2.55 9.308-7.444 11.528-7.57 1.326 1.457-0.795 1.743-3.788 3.854-3.87 2.725-6.99 4.973-12.771 8.25-6.243 3.266-16.078 8.796-28.525 8.154-6.579-0.931-7.134-1.117-10.908-3.073-2.536-1.779-7.852-4.567-9.864-6.779z"/>
+   <linearGradient id="an" x1="129.245" gradientUnits="userSpaceOnUse" x2="195.51" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.317" y2="259.317">
+    <stop stop-color="#F1BD00" offset="0"/>
+    <stop stop-color="#E8B500" offset=".415"/>
+    <stop stop-color="#E8B500" offset="1"/>
+   </linearGradient>
+   <path fill="url(#an)" d="m137.645 109.222c1.825 1.091 2.434 1.715 5.352 3.635 4.569 3.665 12.38 4.615 16.544 4.789 9.631 1.422 26.677-7.562 32.524-11.255 3.491-2.594 9.271-7.392 11.463-7.538 1.287 1.442-0.861 1.718-3.889 3.893-3.853 2.699-6.86 4.882-12.57 8.119-6.195 3.241-16.078 8.797-28.513 8.203-6.6-0.916-7.418-1.163-11.061-3.066-2.603-1.801-7.826-4.546-9.85-6.78z"/>
+   <linearGradient id="ao" x1="129.196" gradientUnits="userSpaceOnUse" x2="195.465" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.322" y2="259.322">
+    <stop stop-color="#EDB800" offset="0"/>
+    <stop stop-color="#E0AD00" offset=".415"/>
+    <stop stop-color="#E0AD00" offset="1"/>
+   </linearGradient>
+   <path fill="url(#ao)" d="m137.596 109.203c1.774 1 2.568 1.752 5.487 3.676 4.545 3.631 12.211 4.615 16.418 4.801 9.764 1.408 26.989-7.695 32.608-11.302 3.557-2.637 9.236-7.338 11.396-7.505 1.247 1.427-0.928 1.693-3.99 3.932-3.833 2.672-6.729 4.791-12.369 7.986-6.148 3.217-16.078 8.799-28.501 8.254-6.619-0.902-7.702-1.21-11.21-3.059-2.672-1.825-7.803-4.525-9.839-6.783z"/>
+   <linearGradient id="ap" x1="129.148" gradientUnits="userSpaceOnUse" x2="195.422" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.327" y2="259.327">
+    <stop stop-color="#E9B300" offset="0"/>
+    <stop stop-color="#D8A500" offset=".415"/>
+    <stop stop-color="#D8A500" offset="1"/>
+   </linearGradient>
+   <path fill="url(#ap)" d="m137.548 109.184c1.724 0.909 2.703 1.788 5.622 3.717 4.522 3.597 12.043 4.615 16.292 4.814 9.896 1.393 27.303-7.829 32.692-11.35 3.624-2.681 9.2-7.286 11.331-7.472 1.208 1.412-0.995 1.668-4.092 3.972-3.814 2.644-6.6 4.698-12.168 7.853-6.101 3.192-16.077 8.8-28.489 8.303-6.638-0.887-7.986-1.256-11.361-3.052-2.741-1.848-7.779-4.504-9.827-6.785z"/>
+   <linearGradient id="aq" x1="129.099" gradientUnits="userSpaceOnUse" x2="195.379" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.332" y2="259.332">
+    <stop stop-color="#E4AE00" offset="0"/>
+    <stop stop-color="#D19E00" offset=".415"/>
+    <stop stop-color="#D19E00" offset="1"/>
+   </linearGradient>
+   <path fill="url(#aq)" d="m137.499 109.166c1.673 0.817 2.838 1.824 5.757 3.757 4.499 3.562 11.875 4.614 16.166 4.827 10.029 1.378 27.615-7.963 32.776-11.398 3.691-2.725 9.164-7.232 11.265-7.439 1.169 1.397-1.061 1.644-4.191 4.01-3.796 2.618-6.469 4.608-11.968 7.722-6.053 3.167-16.077 8.801-28.478 8.353-6.657-0.873-8.27-1.303-11.512-3.046-2.809-1.87-7.755-4.483-9.815-6.786z"/>
+   <linearGradient id="ar" x1="129.051" gradientUnits="userSpaceOnUse" x2="195.338" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.336" y2="259.336">
+    <stop stop-color="#E0A900" offset="0"/>
+    <stop stop-color="#C99600" offset=".415"/>
+    <stop stop-color="#C99600" offset="1"/>
+   </linearGradient>
+   <path fill="url(#ar)" d="m137.451 109.147c1.622 0.726 2.972 1.86 5.892 3.798 4.475 3.528 11.705 4.614 16.04 4.84 10.161 1.362 27.929-8.097 32.859-11.447 3.757-2.767 9.128-7.178 11.2-7.405 1.13 1.382-1.128 1.619-4.294 4.049-3.777 2.592-6.339 4.517-11.767 7.589-6.005 3.143-16.077 8.803-28.466 8.404-6.676-0.859-8.553-1.35-11.663-3.039-2.876-1.894-7.729-4.462-9.801-6.789z"/>
+   <linearGradient id="w" x1="129.003" gradientUnits="userSpaceOnUse" x2="195.296" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.34" y2="259.34">
+    <stop stop-color="#DCA400" offset="0"/>
+    <stop stop-color="#C18E00" offset=".415"/>
+    <stop stop-color="#C18E00" offset="1"/>
+   </linearGradient>
+   <path fill="url(#w)" d="m137.403 109.129c1.571 0.634 3.105 1.896 6.026 3.838 4.45 3.494 11.536 4.614 15.913 4.852 10.295 1.348 28.241-8.23 32.943-11.494 3.824-2.811 9.092-7.125 11.134-7.373 1.092 1.367-1.194 1.594-4.394 4.088-3.759 2.565-6.209 4.425-11.566 7.457-5.957 3.118-16.077 8.804-28.454 8.453-6.694-0.844-8.837-1.396-11.813-3.032-2.945-1.916-7.706-4.44-9.789-6.789z"/>
+   <linearGradient id="x" x1="128.954" gradientUnits="userSpaceOnUse" x2="195.255" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.343" y2="259.343">
+    <stop stop-color="#D79F00" offset="0"/>
+    <stop stop-color="#BA8700" offset=".415"/>
+    <stop stop-color="#BA8700" offset="1"/>
+   </linearGradient>
+   <path fill="url(#x)" d="m137.354 109.11c1.521 0.543 3.241 1.932 6.161 3.879 4.428 3.459 11.368 4.613 15.788 4.865 10.427 1.333 28.554-8.364 33.026-11.542 3.892-2.855 9.057-7.073 11.068-7.339 1.052 1.353-1.261 1.569-4.495 4.127-3.74 2.538-6.078 4.334-11.365 7.325-5.91 3.093-16.077 8.805-28.441 8.503-6.716-0.83-9.121-1.443-11.966-3.026-3.012-1.939-7.68-4.42-9.776-6.792z"/>
+   <linearGradient id="y" x1="128.906" gradientUnits="userSpaceOnUse" x2="195.216" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.348" y2="259.348">
+    <stop stop-color="#D39B00" offset="0"/>
+    <stop stop-color="#B27F00" offset=".415"/>
+    <stop stop-color="#B27F00" offset="1"/>
+   </linearGradient>
+   <path fill="url(#y)" d="m137.306 109.091c1.47 0.451 3.375 1.969 6.296 3.919 4.403 3.426 11.2 4.614 15.662 4.879 10.559 1.318 28.865-8.498 33.109-11.59 3.958-2.899 9.021-7.02 11.003-7.306 1.013 1.337-1.328 1.544-4.596 4.167-3.722 2.511-5.949 4.242-11.165 7.192-5.862 3.068-16.077 8.807-28.43 8.553-6.734-0.816-9.405-1.489-12.116-3.019-3.08-1.963-7.656-4.4-9.763-6.795z"/>
+   <linearGradient id="z" x1="128.857" gradientUnits="userSpaceOnUse" x2="195.176" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.35" y2="259.35">
+    <stop stop-color="#CF9600" offset="0"/>
+    <stop stop-color="#a70" offset=".415"/>
+    <stop stop-color="#a70" offset="1"/>
+   </linearGradient>
+   <path fill="url(#z)" d="m137.257 109.073c1.421 0.359 3.511 2.005 6.432 3.959 4.38 3.392 11.032 4.614 15.536 4.892 10.691 1.303 29.179-8.631 33.193-11.638 4.024-2.942 8.984-6.967 10.938-7.274 0.973 1.323-1.396 1.521-4.697 4.206-3.703 2.484-5.818 4.151-10.964 7.06-5.814 3.043-16.077 8.808-28.418 8.603-6.753-0.802-9.689-1.535-12.268-3.012-3.149-1.986-7.632-4.378-9.752-6.796z"/>
+   <linearGradient id="aa" x1="128.809" gradientUnits="userSpaceOnUse" x2="195.137" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.354" y2="259.354">
+    <stop stop-color="#CA9100" offset="0"/>
+    <stop stop-color="#A37000" offset=".415"/>
+    <stop stop-color="#A37000" offset="1"/>
+   </linearGradient>
+   <path fill="url(#aa)" d="m137.209 109.054c1.368 0.268 3.645 2.041 6.565 4 4.356 3.357 10.864 4.613 15.41 4.904 10.824 1.289 29.493-8.764 33.277-11.685 4.092-2.986 8.948-6.914 10.871-7.241 0.935 1.308-1.461 1.496-4.797 4.245-3.685 2.457-5.688 4.06-10.763 6.928-5.768 3.018-16.077 8.809-28.407 8.653-6.771-0.788-9.972-1.582-12.418-3.006-3.216-2.008-7.607-4.357-9.738-6.798z"/>
+   <linearGradient id="ab" x1="128.76" gradientUnits="userSpaceOnUse" x2="195.099" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.356" y2="259.356">
+    <stop stop-color="#C68C00" offset="0"/>
+    <stop stop-color="#9B6800" offset=".415"/>
+    <stop stop-color="#9B6800" offset="1"/>
+   </linearGradient>
+   <path fill="url(#ab)" d="m137.16 109.036c1.318 0.176 3.779 2.077 6.701 4.04 4.333 3.323 10.695 4.613 15.284 4.917 10.957 1.274 29.805-8.898 33.36-11.733 4.158-3.03 8.912-6.86 10.807-7.208 0.894 1.292-1.528 1.471-4.899 4.284-3.666 2.43-5.558 3.968-10.562 6.796-5.72 2.993-16.077 8.81-28.396 8.702-6.791-0.773-10.256-1.628-12.568-2.999-3.285-2.031-7.583-4.336-9.727-6.799z"/>
+   <linearGradient id="ac" x1="128.712" gradientUnits="userSpaceOnUse" x2="195.062" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.358" y2="259.358">
+    <stop stop-color="#C28700" offset="0"/>
+    <stop stop-color="#936000" offset=".415"/>
+    <stop stop-color="#936000" offset="1"/>
+   </linearGradient>
+   <path fill="url(#ac)" d="m137.112 109.017c1.267 0.085 3.912 2.113 6.835 4.081 4.31 3.289 10.527 4.613 15.158 4.93 11.09 1.258 30.118-9.032 33.445-11.782 4.225-3.072 8.877-6.807 10.739-7.174 0.855 1.278-1.595 1.446-5 4.323-3.647 2.404-5.427 3.877-10.36 6.663-5.673 2.969-16.077 8.812-28.384 8.753-6.811-0.759-10.54-1.675-12.719-2.992-3.353-2.055-7.559-4.315-9.714-6.802z"/>
+   <linearGradient id="ad" x1="128.663" gradientUnits="userSpaceOnUse" x2="195.025" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.36" y2="259.36">
+    <stop stop-color="#BD8200" offset="0"/>
+    <stop stop-color="#8C5900" offset=".415"/>
+    <stop stop-color="#8C5900" offset="1"/>
+   </linearGradient>
+   <path fill="url(#ad)" d="m137.063 108.998c1.217-0.006 4.047 2.15 6.97 4.122 4.286 3.254 10.359 4.612 15.032 4.943 11.223 1.243 30.431-9.166 33.53-11.83 4.289-3.116 8.84-6.753 10.673-7.141 0.815 1.263-1.661 1.421-5.101 4.362-3.63 2.377-5.298 3.785-10.161 6.531-5.624 2.944-16.075 8.813-28.37 8.802-6.83-0.744-10.824-1.721-12.87-2.985-3.422-2.077-7.535-4.294-9.703-6.804z"/>
+   <linearGradient id="ae" x1="128.615" gradientUnits="userSpaceOnUse" x2="194.989" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.362" y2="259.362">
+    <stop stop-color="#B97D00" offset="0"/>
+    <stop stop-color="#845100" offset=".415"/>
+    <stop stop-color="#845100" offset="1"/>
+   </linearGradient>
+   <path fill="url(#ae)" d="m137.015 108.98c1.166-0.098 4.181 2.185 7.104 4.162 4.262 3.22 10.19 4.612 14.906 4.955 11.354 1.229 30.743-9.299 33.613-11.877 4.356-3.16 8.804-6.7 10.607-7.108 0.776 1.248-1.728 1.397-5.202 4.401-3.61 2.35-5.167 3.694-9.96 6.399-5.576 2.919-16.076 8.814-28.358 8.852-6.85-0.73-11.108-1.768-13.021-2.979-3.489-2.1-7.51-4.273-9.689-6.805z"/>
+   <linearGradient id="af" x1="128.567" gradientUnits="userSpaceOnUse" x2="194.954" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.364" y2="259.364">
+    <stop stop-color="#B57800" offset="0"/>
+    <stop stop-color="#7C4900" offset=".415"/>
+    <stop stop-color="#7C4900" offset="1"/>
+   </linearGradient>
+   <path fill="url(#af)" d="m136.967 108.961c1.115-0.189 4.315 2.222 7.239 4.203 4.239 3.186 10.021 4.612 14.78 4.968 11.488 1.214 31.057-9.433 33.697-11.925 4.424-3.203 8.768-6.647 10.542-7.075 0.736 1.233-1.795 1.372-5.303 4.44-3.593 2.323-5.038 3.603-9.759 6.266-5.529 2.895-16.077 8.816-28.348 8.903-6.868-0.716-11.392-1.815-13.172-2.972-3.557-2.124-7.485-4.252-9.676-6.808z"/>
+   <linearGradient id="ah" x1="128.518" gradientUnits="userSpaceOnUse" x2="194.918" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.366" y2="259.366">
+    <stop stop-color="#B07300" offset="0"/>
+    <stop stop-color="#754200" offset=".415"/>
+    <stop stop-color="#754200" offset="1"/>
+   </linearGradient>
+   <path fill="url(#ah)" d="m136.918 108.943c1.064-0.281 4.45 2.257 7.374 4.243 4.216 3.151 9.854 4.611 14.654 4.981 11.621 1.199 31.37-9.567 33.781-11.973 4.49-3.247 8.731-6.594 10.476-7.042 0.698 1.218-1.861 1.347-5.403 4.479-3.573 2.296-4.906 3.511-9.558 6.134-5.48 2.87-16.076 8.817-28.336 8.952-6.887-0.701-11.675-1.861-13.323-2.965-3.626-2.146-7.462-4.231-9.665-6.809z"/>
+   <linearGradient id="ai" x1="128.47" gradientUnits="userSpaceOnUse" x2="194.886" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.367" y2="259.367">
+    <stop stop-color="#AC6E00" offset="0"/>
+    <stop stop-color="#6D3A00" offset=".415"/>
+    <stop stop-color="#6D3A00" offset="1"/>
+   </linearGradient>
+   <path fill="url(#ai)" d="m136.87 108.924c1.013-0.372 4.584 2.294 7.509 4.284 4.191 3.117 9.685 4.611 14.528 4.994 11.753 1.184 31.682-9.701 33.864-12.021 4.557-3.291 8.695-6.542 10.411-7.009 0.657 1.203-1.929 1.322-5.504 4.518-3.557 2.269-4.777 3.42-9.358 6.002-5.434 2.845-16.076 8.818-28.324 9.002-6.907-0.687-11.959-1.908-13.474-2.959-3.694-2.169-7.437-4.21-9.652-6.811z"/>
+   <linearGradient id="aj" x1="128.421" gradientUnits="userSpaceOnUse" x2="194.85" gradientTransform="matrix(1,0,0,-1,8.3999,368.3)" y1="259.369" y2="259.369">
+    <stop stop-color="#A86A00" offset="0"/>
+    <stop stop-color="#663200" offset=".415"/>
+    <stop stop-color="#663200" offset="1"/>
+   </linearGradient>
+   <path fill="url(#aj)" d="m136.821 108.905c0.963-0.464 4.719 2.33 7.644 4.324 4.168 3.083 9.517 4.611 14.402 5.007 11.886 1.169 31.995-9.834 33.948-12.069 4.624-3.334 8.66-6.487 10.345-6.976 0.619 1.188-1.995 1.298-5.604 4.558-3.537 2.242-4.647 3.328-9.157 5.869-5.386 2.82-16.076 8.82-28.313 9.052-6.926-0.673-12.243-1.954-13.625-2.952-3.762-2.192-7.413-4.189-9.64-6.813z"/>
+  </g>
+ </g>
+</svg>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.aird b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.aird
index 20116d757c..1f159471d1 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.aird
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.aird
@@ -1,7 +1,8 @@
 <?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/1.1.0#//diagram/description http://www.eclipse.org/sirius/diagram/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram/description/style" xmi:id="_PoAAsRxKEeK_vrDrz68WyA" selectedViews="_QXOeMBxKEeK_vrDrz68WyA" version="8.0.0">
-  <models xmi:type="ecore:EPackage" href="VP-3601.ecore#/"/>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_QXOeMBxKEeK_vrDrz68WyA" initialized="true">
+<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="_PoAAsRxKEeK_vrDrz68WyA" selectedViews="_QXOeMBxKEeK_vrDrz68WyA" version="11.0.0.201604141600">
+  <semanticResources>VP-3601.ecore</semanticResources>
+  <ownedViews xmi:type="viewpoint:DView" xmi:id="_QXOeMBxKEeK_vrDrz68WyA">
+    <viewpoint xmi:type="description:Viewpoint" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']"/>
     <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_oUqHsBxKEeK_vrDrz68WyA" name="rep1">
       <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_oU7NcBxKEeK_vrDrz68WyA" source="GMF_DIAGRAMS">
         <data xmi:type="notation:Diagram" xmi:id="_oU7NcRxKEeK_vrDrz68WyA" type="Sirius" element="_oUqHsBxKEeK_vrDrz68WyA" measurementUnit="Pixel">
@@ -90,7 +91,7 @@
                     <styles xmi:type="notation:ShapeStyle" xmi:id="_PKpXIR6LEeKIm-E6K2efjg" fontName="Ubuntu"/>
                     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PKpXIh6LEeKIm-E6K2efjg"/>
                   </children>
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_PKoJAR6LEeKIm-E6K2efjg" fontName="Ubuntu" fontHeight="8"/>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_PKoJAR6LEeKIm-E6K2efjg" fontName="Ubuntu" fontHeight="8" fillColor="8905185"/>
                   <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PKoJAh6LEeKIm-E6K2efjg" x="198" y="36" width="10" height="10"/>
                 </children>
                 <styles xmi:type="notation:ShapeStyle" xmi:id="_oVGMkRxKEeK_vrDrz68WyA" fontName="Ubuntu" fontHeight="8"/>
@@ -256,15 +257,14 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_24Z7IDngEeapVIdAjJQZ1A" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_24Z7ITngEeapVIdAjJQZ1A"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_oUqHsRxKEeK_vrDrz68WyA" name="LC1">
         <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
         <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_oUqHshxKEeK_vrDrz68WyA">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqHsxxKEeK_vrDrz68WyA"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_oUqHshxKEeK_vrDrz68WyA" borderSize="1" borderSizeComputationExpression="1" backgroundColor="194,239,255" foregroundColor="39,76,114">
           <description xmi:type="style:FlatContainerStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqHtBxKEeK_vrDrz68WyA"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqHtRxKEeK_vrDrz68WyA" red="194" green="239" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_oUquwBxKEeK_vrDrz68WyA" red="39" green="76" blue="114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_oUquwRxKEeK_vrDrz68WyA" name="LogicalFunction1" width="3" height="3" resizeKind="NSEW">
@@ -273,66 +273,48 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_oUquwhxKEeK_vrDrz68WyA" name="a1" incomingEdges="_PKlFtR6LEeKIm-E6K2efjg" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a1"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a1"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_oUquwxxKEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oUquxBxKEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_oUquwxxKEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_oUquxRxKEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_oUquxhxKEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_oUquxxxKEeK_vrDrz68WyA" name="a2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a2"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a2"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_oUquyBxKEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oUquyRxKEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_oUquyBxKEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_oUquyhxKEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_oUquyxxKEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_oUquzBxKEeK_vrDrz68WyA" name="a3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a3"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a3"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_oUquzRxKEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oUquzhxKEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_oUquzRxKEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_oUquzxxKEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_oUqu0BxKEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_oUqu0RxKEeK_vrDrz68WyA" name="a4" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a4"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a4"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_oUqu0hxKEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu0xxKEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_oUqu0hxKEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu1BxKEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_oUqu1RxKEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_oUqu1hxKEeK_vrDrz68WyA" name="a5" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a5"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a5"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_oUqu1xxKEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu2BxKEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_oUqu1xxKEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu2RxKEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_oUqu2hxKEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_oUqu2xxKEeK_vrDrz68WyA" name="a6" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a6"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a6"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_oUqu3BxKEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu3RxKEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_oUqu3BxKEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu3hxKEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_oUqu3xxKEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
@@ -342,19 +324,14 @@
             <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
             <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
             <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_PKe_EB6LEeKIm-E6K2efjg">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_PKe_ER6LEeKIm-E6K2efjg"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_PKe_EB6LEeKIm-E6K2efjg" color="225,225,135">
+              <customFeatures>color</customFeatures>
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_PKe_Eh6LEeKIm-E6K2efjg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_PKe_Ex6LEeKIm-E6K2efjg" red="194" green="239" blue="255"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_oUqu4BxKEeK_vrDrz68WyA" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu4RxKEeK_vrDrz68WyA"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_oUqu4BxKEeK_vrDrz68WyA" labelPosition="node" color="138,226,52">
             <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu4hxKEeK_vrDrz68WyA"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_oUqu4xxKEeK_vrDrz68WyA" red="138" green="226" blue="52"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']"/>
         </ownedDiagramElements>
@@ -362,12 +339,8 @@
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_oUqu5BxKEeK_vrDrz68WyA" name="LC2">
         <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
         <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_oUqu5RxKEeK_vrDrz68WyA">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu5hxKEeK_vrDrz68WyA"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_oUqu5RxKEeK_vrDrz68WyA" borderSize="1" borderSizeComputationExpression="1" backgroundColor="194,239,255" foregroundColor="39,76,114">
           <description xmi:type="style:FlatContainerStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu5xxKEeK_vrDrz68WyA"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu6BxKEeK_vrDrz68WyA" red="194" green="239" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu6RxKEeK_vrDrz68WyA" red="39" green="76" blue="114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']"/>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_oUqu6hxKEeK_vrDrz68WyA" name="LogicalFunction2" width="3" height="3" resizeKind="NSEW">
@@ -376,88 +349,64 @@
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ekGXIBxLEeK_vrDrz68WyA" name="b1" incomingEdges="_PKlFsB6LEeKIm-E6K2efjg" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b1"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b1"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekG-MBxLEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ekG-MRxLEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekG-MBxLEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ekG-MhxLEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ekG-MxxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ekG-NBxLEeK_vrDrz68WyA" name="b2" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b2"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b2"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekHlQBxLEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ekHlQRxLEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekHlQBxLEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ekHlQhxLEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ekHlQxxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ekIMUBxLEeK_vrDrz68WyA" name="b3" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b3"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b3"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekIMURxLEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ekIMUhxLEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekIMURxLEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ekIMUxxLEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ekIMVBxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ekIzYBxLEeK_vrDrz68WyA" name="b4" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b4"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b4"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekIzYRxLEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ekIzYhxLEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekIzYRxLEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ekIzYxxLEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ekIzZBxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ekJacBxLEeK_vrDrz68WyA" name="b5" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b5"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b5"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekJacRxLEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ekJachxLEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekJacRxLEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ekJacxxLEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ekJadBxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ekKBgBxLEeK_vrDrz68WyA" name="b6" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b6"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b6"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekKBgRxLEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ekKBghxLEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekKBgRxLEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ekKokBxLEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ekKokRxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ekKokhxLEeK_vrDrz68WyA" name="b7" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b7"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b7"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekLPoBxLEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ekLPoRxLEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekLPoBxLEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ekLPohxLEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ekLPoxxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
           <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_ekL2sBxLEeK_vrDrz68WyA" name="b8" width="1" height="1" resizeKind="NSEW">
             <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b8"/>
             <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b8"/>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekL2sRxLEeK_vrDrz68WyA">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ekL2shxLEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_ekL2sRxLEeK_vrDrz68WyA" color="252,175,62">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ekL2sxxLEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_ekL2tBxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
           </ownedBorderedNodes>
@@ -467,19 +416,13 @@
             <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
             <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
             <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_PKj3kB6LEeKIm-E6K2efjg">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_PKj3kR6LEeKIm-E6K2efjg"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_PKj3kB6LEeKIm-E6K2efjg" color="194,239,255">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_PKj3kh6LEeKIm-E6K2efjg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_PKj3kx6LEeKIm-E6K2efjg" red="194" green="239" blue="255"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']"/>
           </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_oUqu6xxKEeK_vrDrz68WyA" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu7BxKEeK_vrDrz68WyA"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_oUqu6xxKEeK_vrDrz68WyA" labelPosition="node" color="138,226,52">
             <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_oUqu7RxKEeK_vrDrz68WyA"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_oUqu7hxKEeK_vrDrz68WyA" red="138" green="226" blue="52"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']"/>
         </ownedDiagramElements>
@@ -488,10 +431,7 @@
         <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/r1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_PKlFsR6LEeKIm-E6K2efjg" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_PKlFsh6LEeKIm-E6K2efjg" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_PKlFsx6LEeKIm-E6K2efjg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_PKlFtB6LEeKIm-E6K2efjg"/>
-          </centerLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_PKlFsx6LEeKIm-E6K2efjg"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']"/>
       </ownedDiagramElements>
@@ -499,10 +439,7 @@
         <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/r2"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_PKlswB6LEeKIm-E6K2efjg" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_PKlswR6LEeKIm-E6K2efjg" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_PKlswh6LEeKIm-E6K2efjg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_PKlswx6LEeKIm-E6K2efjg"/>
-          </centerLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_PKlswh6LEeKIm-E6K2efjg"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']"/>
       </ownedDiagramElements>
@@ -774,26 +711,21 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_24jsIDngEeapVIdAjJQZ1A" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_24jsITngEeapVIdAjJQZ1A"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_sCcyoRxLEeK_vrDrz68WyA" name="LogicalSystem">
         <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem"/>
         <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_sCcyohxLEeK_vrDrz68WyA">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCcyoxxLEeK_vrDrz68WyA"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_sCcyohxLEeK_vrDrz68WyA" borderSize="1" borderSizeComputationExpression="1" backgroundColor="194,239,255" foregroundColor="39,76,114">
           <description xmi:type="style:FlatContainerStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCcypBxLEeK_vrDrz68WyA"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_sCcypRxLEeK_vrDrz68WyA" red="194" green="239" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_sCcyphxLEeK_vrDrz68WyA" red="39" green="76" blue="114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']"/>
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_sCcypxxLEeK_vrDrz68WyA" name="LC1">
           <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
           <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_sCcyqBxLEeK_vrDrz68WyA">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCcyqRxLEeK_vrDrz68WyA"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_sCcyqBxLEeK_vrDrz68WyA" borderSize="1" borderSizeComputationExpression="1" backgroundColor="194,239,255" foregroundColor="39,76,114">
             <description xmi:type="style:FlatContainerStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCcyqhxLEeK_vrDrz68WyA"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_sCcyqxxLEeK_vrDrz68WyA" red="194" green="239" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_sCcyrBxLEeK_vrDrz68WyA" red="39" green="76" blue="114"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']"/>
           <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_sCcyrRxLEeK_vrDrz68WyA" name="LogicalFunction1" width="3" height="3" resizeKind="NSEW">
@@ -805,11 +737,8 @@
               <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
               <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
               <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCcyrxxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCcysBxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCcyrxxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCcysRxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCcyshxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
@@ -819,11 +748,8 @@
               <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
               <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
               <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCcytBxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCcytRxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCcytBxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCcythxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCcytxxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
@@ -833,11 +759,8 @@
               <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
               <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
               <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCcyuRxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZsBxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCcyuRxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZsRxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCdZshxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
@@ -847,11 +770,8 @@
               <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
               <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
               <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZtBxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZtRxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZtBxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZthxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCdZtxxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
@@ -861,11 +781,8 @@
               <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
               <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
               <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZuRxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZuhxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZuRxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZuxxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCdZvBxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
@@ -875,30 +792,21 @@
               <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
               <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
               <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZvhxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZvxxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZvhxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZwBxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCdZwRxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
             <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_PUcMUB6LEeKIm-E6K2efjg" name="r1" outgoingEdges="_PUjhEB6LEeKIm-E6K2efjg" width="1" height="1" resizeKind="NSEW">
               <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/r1"/>
               <semanticElements xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/r1"/>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_PUczYB6LEeKIm-E6K2efjg">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_PUczYR6LEeKIm-E6K2efjg"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_PUczYB6LEeKIm-E6K2efjg" color="194,239,255">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_PUczYh6LEeKIm-E6K2efjg"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_PUczYx6LEeKIm-E6K2efjg" red="194" green="239" blue="255"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']"/>
             </ownedBorderedNodes>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZwhxLEeK_vrDrz68WyA" labelPosition="node">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZwxxLEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZwhxLEeK_vrDrz68WyA" labelPosition="node" color="138,226,52">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZxBxLEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_sCdZxRxLEeK_vrDrz68WyA" red="138" green="226" blue="52"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']"/>
           </ownedDiagramElements>
@@ -906,12 +814,8 @@
         <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_sCdZxhxLEeK_vrDrz68WyA" name="LC2">
           <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
           <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_sCdZxxxLEeK_vrDrz68WyA">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZyBxLEeK_vrDrz68WyA"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_sCdZxxxLEeK_vrDrz68WyA" borderSize="1" borderSizeComputationExpression="1" backgroundColor="194,239,255" foregroundColor="39,76,114">
             <description xmi:type="style:FlatContainerStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZyRxLEeK_vrDrz68WyA"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZyhxLEeK_vrDrz68WyA" red="194" green="239" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZyxxLEeK_vrDrz68WyA" red="39" green="76" blue="114"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']"/>
           <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_sCdZzBxLEeK_vrDrz68WyA" name="LogicalFunction2" width="3" height="3" resizeKind="NSEW">
@@ -920,11 +824,8 @@
             <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_sCdZzRxLEeK_vrDrz68WyA" name="b1" incomingEdges="_PUjhEB6LEeKIm-E6K2efjg" width="1" height="1" resizeKind="NSEW">
               <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b1"/>
               <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b1"/>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZzhxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZzxxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZzhxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ0BxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ0RxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
@@ -934,22 +835,16 @@
               <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
               <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
               <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZ0xxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ1BxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZ0xxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ1RxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ1hxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
             <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_sCdZ1xxLEeK_vrDrz68WyA" name="b3" width="1" height="1" resizeKind="NSEW">
               <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b3"/>
               <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b3"/>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZ2BxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ2RxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZ2BxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ2hxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ2xxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
@@ -959,11 +854,8 @@
               <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
               <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
               <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZ3RxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ3hxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZ3RxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ3xxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ4BxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
@@ -973,11 +865,8 @@
               <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
               <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
               <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZ4hxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ4xxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZ4hxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ5BxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ5RxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
@@ -987,11 +876,8 @@
               <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
               <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
               <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZ5xxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ6BxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZ5xxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ6RxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCdZ6hxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
@@ -1001,11 +887,8 @@
               <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
               <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
               <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZ7BxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCeAwBxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCdZ7BxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCeAwRxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCeAwhxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
@@ -1015,30 +898,21 @@
               <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
               <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
               <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCeAxBxLEeK_vrDrz68WyA">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCeAxRxLEeK_vrDrz68WyA"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_sCeAxBxLEeK_vrDrz68WyA" color="252,175,62">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCeAxhxLEeK_vrDrz68WyA"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_sCeAxxxLEeK_vrDrz68WyA" red="252" green="175" blue="62"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
             </ownedBorderedNodes>
             <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_PUhr4B6LEeKIm-E6K2efjg" name="r2" outgoingEdges="_PUkIJB6LEeKIm-E6K2efjg" width="1" height="1" resizeKind="NSEW">
               <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/r2"/>
               <semanticElements xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/r2"/>
-              <ownedStyle xmi:type="diagram:Square" xmi:id="_PUiS8B6LEeKIm-E6K2efjg">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_PUiS8R6LEeKIm-E6K2efjg"/>
+              <ownedStyle xmi:type="diagram:Square" xmi:id="_PUiS8B6LEeKIm-E6K2efjg" color="194,239,255">
                 <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_PUiS8h6LEeKIm-E6K2efjg"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_PUiS8x6LEeKIm-E6K2efjg" red="194" green="239" blue="255"/>
               </ownedStyle>
               <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']"/>
             </ownedBorderedNodes>
-            <ownedStyle xmi:type="diagram:Square" xmi:id="_sCeAyBxLEeK_vrDrz68WyA" labelPosition="node">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sCeAyRxLEeK_vrDrz68WyA"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_sCeAyBxLEeK_vrDrz68WyA" labelPosition="node" color="138,226,52">
               <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_sCeAyhxLEeK_vrDrz68WyA"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_sCeAyxxLEeK_vrDrz68WyA" red="138" green="226" blue="52"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']"/>
           </ownedDiagramElements>
@@ -1048,10 +922,7 @@
         <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/r1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_PUkIIB6LEeKIm-E6K2efjg" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_PUkIIR6LEeKIm-E6K2efjg" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_PUkIIh6LEeKIm-E6K2efjg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_PUkIIx6LEeKIm-E6K2efjg"/>
-          </centerLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_PUkIIh6LEeKIm-E6K2efjg"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']"/>
       </ownedDiagramElements>
@@ -1059,10 +930,7 @@
         <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/r2"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_PUkvMB6LEeKIm-E6K2efjg" size="2">
           <description xmi:type="style:EdgeStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_PUkvMR6LEeKIm-E6K2efjg" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_PUkvMh6LEeKIm-E6K2efjg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_PUkvMx6LEeKIm-E6K2efjg"/>
-          </centerLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_PUkvMh6LEeKIm-E6K2efjg"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']"/>
       </ownedDiagramElements>
@@ -1071,6 +939,1225 @@
       <activatedLayers xmi:type="description_1:Layer" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer"/>
       <target xmi:type="ecore:EPackage" href="VP-3601.ecore#/"/>
     </ownedRepresentations>
-    <viewpoint xmi:type="description:Viewpoint" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']"/>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_-JDKgDodEeaKHpEjEbgjtg" name="rep3AdaptedForCopyPasteFormatTest">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_-JDKgTodEeaKHpEjEbgjtg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_-JDKgjodEeaKHpEjEbgjtg"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_-JcMEDodEeaKHpEjEbgjtg" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_-JcMETodEeaKHpEjEbgjtg" type="Sirius" element="_-JDKgDodEeaKHpEjEbgjtg" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_-JqOgDodEeaKHpEjEbgjtg" type="2002" element="_-JDKgzodEeaKHpEjEbgjtg">
+            <children xmi:type="notation:Node" xmi:id="_-Jw8MDodEeaKHpEjEbgjtg" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_-Jz_gDodEeaKHpEjEbgjtg" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_-J5fEDodEeaKHpEjEbgjtg" type="3007" element="_-JDKhTodEeaKHpEjEbgjtg">
+                <children xmi:type="notation:Node" xmi:id="_-J9JcDodEeaKHpEjEbgjtg" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_ORVcszoeEeaKHpEjEbgjtg" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KBa4DodEeaKHpEjEbgjtg" type="3001" element="_-JDKhjodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KBa4zodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORUOlToeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KRSgDodEeaKHpEjEbgjtg" type="3003" element="_-JDKhzodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KRSgTodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KRSgjodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KBa4TodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORUOlDoeEeaKHpEjEbgjtg" x="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KG6cDodEeaKHpEjEbgjtg" type="3001" element="_-JDKiDodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KHhgDodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORU1ozoeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KRSgzodEeaKHpEjEbgjtg" type="3003" element="_-JDKiTodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KRShDodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KRShTodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KG6cTodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORU1ojoeEeaKHpEjEbgjtg" x="198" y="84" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KHhgjodEeaKHpEjEbgjtg" type="3001" element="_-JDKijodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KIIkDodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORVcsjoeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KSgoDodEeaKHpEjEbgjtg" type="3003" element="_-JDKizodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KSgoTodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KSgojodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KHhgzodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORVcsToeEeaKHpEjEbgjtg" x="-2" y="84" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KIIkjodEeaKHpEjEbgjtg" type="3001" element="_-JDKjDodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KIvoDodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORUOkToeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KTHsDodEeaKHpEjEbgjtg" type="3003" element="_-JDKjTodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KTHsTodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KTHsjodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KIIkzodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORUOkDoeEeaKHpEjEbgjtg" x="-2" y="156" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KJWsDodEeaKHpEjEbgjtg" type="3001" element="_-JDKjjodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KJ9wDodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORUOkzoeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KTHszodEeaKHpEjEbgjtg" type="3003" element="_-JDKjzodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KTHtDodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KTHtTodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KJWsTodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORUOkjoeEeaKHpEjEbgjtg" x="198" y="156" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KJ9wjodEeaKHpEjEbgjtg" type="3001" element="_-JDKkDodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KKk0DodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORU1oToeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KTuwDodEeaKHpEjEbgjtg" type="3003" element="_-JDKkTodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KTuwTodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KTuwjodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KJ9wzodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORU1oDoeEeaKHpEjEbgjtg" x="192" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KLL4DodEeaKHpEjEbgjtg" type="3001" element="_-JDKkjodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KLL4zodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORU1pToeEeaKHpEjEbgjtg" x="11" y="-9"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KTuwzodEeaKHpEjEbgjtg" type="3003" element="_-JDKkzodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KTuxDodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KTuxTodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KLL4TodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORU1pDoeEeaKHpEjEbgjtg" x="198" y="36" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KQEYDodEeaKHpEjEbgjtg" type="3003" element="_-JDKlDodEeaKHpEjEbgjtg">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KQEYTodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KQEYjodEeaKHpEjEbgjtg"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_-J5fETodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORTngToeEeaKHpEjEbgjtg" x="55" y="30" width="206" height="169"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_-Jz_gTodEeaKHpEjEbgjtg"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_-Jz_gjodEeaKHpEjEbgjtg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_-JqOgTodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORTngDoeEeaKHpEjEbgjtg" x="96" y="96" width="363" height="255"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_-J0mkDodEeaKHpEjEbgjtg" type="2002" element="_-JDKlTodEeaKHpEjEbgjtg">
+            <children xmi:type="notation:Node" xmi:id="_-J1NoDodEeaKHpEjEbgjtg" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_-J1NoTodEeaKHpEjEbgjtg" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_-KUV0DodEeaKHpEjEbgjtg" type="3007" element="_-JDKlzodEeaKHpEjEbgjtg">
+                <children xmi:type="notation:Node" xmi:id="_-KU84DodEeaKHpEjEbgjtg" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_ORWq0joeEeaKHpEjEbgjtg" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KU84jodEeaKHpEjEbgjtg" type="3001" element="_-JDKmDodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KU85TodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORVctzoeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KiYQDodEeaKHpEjEbgjtg" type="3003" element="_-JDKmTodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KiYQTodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KiYQjodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KU84zodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORVctjoeEeaKHpEjEbgjtg" x="1" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KVj8DodEeaKHpEjEbgjtg" type="3001" element="_-JDKmjodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KVj8zodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORWDxToeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-Ki_UDodEeaKHpEjEbgjtg" type="3003" element="_-JDKmzodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-Ki_UTodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-Ki_UjodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KVj8TodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORWDxDoeEeaKHpEjEbgjtg" x="-2" y="60" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KWyEDodEeaKHpEjEbgjtg" type="3001" element="_-JDKnDodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KWyEzodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORWDyToeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KjmYDodEeaKHpEjEbgjtg" type="3003" element="_-JDKnTodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KjmYTodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KjmYjodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KWyETodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORWDyDoeEeaKHpEjEbgjtg" x="85" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KXZIDodEeaKHpEjEbgjtg" type="3001" element="_-JDKnjodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KYAMDodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORWDzToeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KjmYzodEeaKHpEjEbgjtg" type="3003" element="_-JDKnzodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KjmZDodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KjmZTodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KXZITodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORWDzDoeEeaKHpEjEbgjtg" x="85" y="125" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KYAMjodEeaKHpEjEbgjtg" type="3001" element="_-JDKoDodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KYnQDodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORWDxzoeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KkNcDodEeaKHpEjEbgjtg" type="3003" element="_-JDKoTodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KkNcTodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KkNcjodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KYAMzodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORWDxjoeEeaKHpEjEbgjtg" x="174" y="48" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KZOUDodEeaKHpEjEbgjtg" type="3001" element="_-JDKojodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KZOUzodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORWq0ToeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KkNczodEeaKHpEjEbgjtg" type="3003" element="_-JDKozodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KkNdDodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KkNdTodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KZOUTodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORWq0DoeEeaKHpEjEbgjtg" x="1" y="125" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KZ1YDodEeaKHpEjEbgjtg" type="3001" element="_-JDKpDodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KbqkDodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORWDyzoeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-Kk0gDodEeaKHpEjEbgjtg" type="3003" element="_-JDKpTodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-Kk0gTodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-Kk0gjodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KZ1YTodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORWDyjoeEeaKHpEjEbgjtg" x="174" y="120" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KcRoDodEeaKHpEjEbgjtg" type="3001" element="_-JDKpjodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-Kc4sDodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORWDzzoeEeaKHpEjEbgjtg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KlbkDodEeaKHpEjEbgjtg" type="3003" element="_-JDKpzodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KlbkTodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KlbkjodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KcRoTodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORWDzjoeEeaKHpEjEbgjtg" x="174" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-KeG0DodEeaKHpEjEbgjtg" type="3001" element="_-JDKqDodEeaKHpEjEbgjtg">
+                  <children xmi:type="notation:Node" xmi:id="_-KeG0zodEeaKHpEjEbgjtg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_ORWDwToeEeaKHpEjEbgjtg" x="11" y="-9"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_-KlbkzodEeaKHpEjEbgjtg" type="3003" element="_-JDKqTodEeaKHpEjEbgjtg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_-KlblDodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-KlblTodEeaKHpEjEbgjtg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-KeG0TodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORWDwDoeEeaKHpEjEbgjtg" x="-2" y="84" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_-Ket4DodEeaKHpEjEbgjtg" type="3003" element="_-JDKqjodEeaKHpEjEbgjtg">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_-Ket4TodEeaKHpEjEbgjtg" fontName="Segoe UI"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-Ket4jodEeaKHpEjEbgjtg"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_-KUV0TodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORVctToeEeaKHpEjEbgjtg" x="55" y="30" width="182" height="133"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_-J1NojodEeaKHpEjEbgjtg"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_-J1NozodEeaKHpEjEbgjtg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_-J0mkTodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8" fillColor="10265827"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORVctDoeEeaKHpEjEbgjtg" x="600" y="72" width="291" height="243"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_-JcMEjodEeaKHpEjEbgjtg"/>
+          <edges xmi:type="notation:Edge" xmi:id="_-KriMDodEeaKHpEjEbgjtg" type="4001" element="_-JDKqzodEeaKHpEjEbgjtg" source="_-KLL4DodEeaKHpEjEbgjtg" target="_-KU84jodEeaKHpEjEbgjtg">
+            <children xmi:type="notation:Node" xmi:id="_-KvMkDodEeaKHpEjEbgjtg" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORVcsDoeEeaKHpEjEbgjtg" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_-Kxo0DodEeaKHpEjEbgjtg" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-Kxo0TodEeaKHpEjEbgjtg" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_-K0FEDodEeaKHpEjEbgjtg" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-K0FETodEeaKHpEjEbgjtg" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_-KriMTodEeaKHpEjEbgjtg"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_-KriMjodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ORU1pjoeEeaKHpEjEbgjtg" points="[5, -2, -302, 60]$[302, -61, -5, 1]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-K3IYDodEeaKHpEjEbgjtg" id="(0.5,0.5)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-LCukDodEeaKHpEjEbgjtg" id="(0.5,0.5)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_-LCukTodEeaKHpEjEbgjtg" type="4001" element="_-JDKrjodEeaKHpEjEbgjtg" source="_-KeG0DodEeaKHpEjEbgjtg" target="_-KBa4DodEeaKHpEjEbgjtg">
+            <children xmi:type="notation:Node" xmi:id="_-LDVoDodEeaKHpEjEbgjtg" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ORWDwzoeEeaKHpEjEbgjtg" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_-LD8sDodEeaKHpEjEbgjtg" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-LD8sTodEeaKHpEjEbgjtg" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_-LD8sjodEeaKHpEjEbgjtg" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-LD8szodEeaKHpEjEbgjtg" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_-LCukjodEeaKHpEjEbgjtg"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_-LCukzodEeaKHpEjEbgjtg" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ORWDwjoeEeaKHpEjEbgjtg" points="[-5, -1, 499, 59]$[-499, -60, 5, 0]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-LD8tDodEeaKHpEjEbgjtg" id="(0.5,0.5)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-LD8tTodEeaKHpEjEbgjtg" id="(0.5,0.5)"/>
+          </edges>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_-JDKgzodEeaKHpEjEbgjtg" name="LC1">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_-JDKhDodEeaKHpEjEbgjtg" borderSize="1" borderSizeComputationExpression="1" backgroundColor="194,239,255" foregroundColor="39,76,114">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']"/>
+        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_-JDKhTodEeaKHpEjEbgjtg" name="LogicalFunction1" width="3" height="3" resizeKind="NSEW">
+          <target xmi:type="ecore:EClass" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1"/>
+          <semanticElements xmi:type="ecore:EClass" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1"/>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKhjodEeaKHpEjEbgjtg" name="a1" incomingEdges="_-JDKrjodEeaKHpEjEbgjtg" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a1"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a1"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKhzodEeaKHpEjEbgjtg" color="252,175,62">
+              <customFeatures>color</customFeatures>
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKiDodEeaKHpEjEbgjtg" name="a2" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a2"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a2"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKiTodEeaKHpEjEbgjtg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKijodEeaKHpEjEbgjtg" name="a3" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a3"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a3"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKizodEeaKHpEjEbgjtg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKjDodEeaKHpEjEbgjtg" name="a4" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a4"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a4"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKjTodEeaKHpEjEbgjtg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKjjodEeaKHpEjEbgjtg" name="a5" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a5"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a5"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKjzodEeaKHpEjEbgjtg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKkDodEeaKHpEjEbgjtg" name="a6" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a6"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a6"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKkTodEeaKHpEjEbgjtg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKkjodEeaKHpEjEbgjtg" name="r1" outgoingEdges="_-JDKqzodEeaKHpEjEbgjtg" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/r1"/>
+            <semanticElements xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/r1"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKkzodEeaKHpEjEbgjtg" color="194,239,255">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']"/>
+          </ownedBorderedNodes>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKlDodEeaKHpEjEbgjtg" labelPosition="node" color="138,226,52">
+            <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']"/>
+        </ownedDiagramElements>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_-JDKlTodEeaKHpEjEbgjtg" name="LC2">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_-JDKljodEeaKHpEjEbgjtg" borderSize="1" borderSizeComputationExpression="1" backgroundColor="227,164,156" foregroundColor="227,164,156">
+          <customFeatures>backgroundColor</customFeatures>
+          <customFeatures>foregroundColor</customFeatures>
+          <description xmi:type="style:FlatContainerStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']"/>
+        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_-JDKlzodEeaKHpEjEbgjtg" name="LogicalFunction2" width="3" height="3" resizeKind="NSEW">
+          <target xmi:type="ecore:EClass" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2"/>
+          <semanticElements xmi:type="ecore:EClass" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2"/>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKmDodEeaKHpEjEbgjtg" name="b1" incomingEdges="_-JDKqzodEeaKHpEjEbgjtg" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b1"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b1"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKmTodEeaKHpEjEbgjtg" color="252,233,79">
+              <customFeatures>color</customFeatures>
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKmjodEeaKHpEjEbgjtg" name="b2" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b2"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b2"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKmzodEeaKHpEjEbgjtg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKnDodEeaKHpEjEbgjtg" name="b3" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b3"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b3"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKnTodEeaKHpEjEbgjtg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKnjodEeaKHpEjEbgjtg" name="b4" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b4"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b4"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKnzodEeaKHpEjEbgjtg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKoDodEeaKHpEjEbgjtg" name="b5" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b5"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b5"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKoTodEeaKHpEjEbgjtg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKojodEeaKHpEjEbgjtg" name="b6" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b6"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b6"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKozodEeaKHpEjEbgjtg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKpDodEeaKHpEjEbgjtg" name="b7" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b7"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b7"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKpTodEeaKHpEjEbgjtg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKpjodEeaKHpEjEbgjtg" name="b8" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b8"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b8"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKpzodEeaKHpEjEbgjtg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_-JDKqDodEeaKHpEjEbgjtg" name="r2" outgoingEdges="_-JDKrjodEeaKHpEjEbgjtg" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/r2"/>
+            <semanticElements xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/r2"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKqTodEeaKHpEjEbgjtg" color="194,239,255">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']"/>
+          </ownedBorderedNodes>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_-JDKqjodEeaKHpEjEbgjtg" labelPosition="node" color="138,226,52">
+            <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']"/>
+        </ownedDiagramElements>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_-JDKqzodEeaKHpEjEbgjtg" sourceNode="_-JDKkjodEeaKHpEjEbgjtg" targetNode="_-JDKmDodEeaKHpEjEbgjtg">
+        <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/r1"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_-JDKrDodEeaKHpEjEbgjtg" size="2">
+          <description xmi:type="style:EdgeStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']/@style"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_-JDKrTodEeaKHpEjEbgjtg"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_-JDKrjodEeaKHpEjEbgjtg" sourceNode="_-JDKqDodEeaKHpEjEbgjtg" targetNode="_-JDKhjodEeaKHpEjEbgjtg">
+        <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/r2"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_-JDKrzodEeaKHpEjEbgjtg" size="2">
+          <description xmi:type="style:EdgeStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']/@style"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_-JDKsDodEeaKHpEjEbgjtg"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_-JDKsTodEeaKHpEjEbgjtg"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_cwtagDxGEeaNdvCpIK_eyQ" name="rep5AdaptedForCopyPasteFormatTest">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_cwtagTxGEeaNdvCpIK_eyQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_cwtagjxGEeaNdvCpIK_eyQ"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_cwuBkDxGEeaNdvCpIK_eyQ" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_cwuBkTxGEeaNdvCpIK_eyQ" type="Sirius" element="_cwtagDxGEeaNdvCpIK_eyQ" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_cwuBkzxGEeaNdvCpIK_eyQ" type="2001" element="_cwtagzxGEeaNdvCpIK_eyQ">
+            <children xmi:type="notation:Node" xmi:id="_cwuooDxGEeaNdvCpIK_eyQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_cwuooTxGEeaNdvCpIK_eyQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_cwvPsjxGEeaNdvCpIK_eyQ" type="3003" element="_cwtahDxGEeaNdvCpIK_eyQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_cwvPszxGEeaNdvCpIK_eyQ" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cwvPtDxGEeaNdvCpIK_eyQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_cwuBlDxGEeaNdvCpIK_eyQ" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cwuBlTxGEeaNdvCpIK_eyQ" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_cwuoojxGEeaNdvCpIK_eyQ" type="2001" element="_cwtahTxGEeaNdvCpIK_eyQ">
+            <children xmi:type="notation:Node" xmi:id="_cwvPsDxGEeaNdvCpIK_eyQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_cwvPsTxGEeaNdvCpIK_eyQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_cwvPtTxGEeaNdvCpIK_eyQ" type="3003" element="_cwtahjxGEeaNdvCpIK_eyQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_cwvPtjxGEeaNdvCpIK_eyQ" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cwvPtzxGEeaNdvCpIK_eyQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_cwuoozxGEeaNdvCpIK_eyQ" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cwuopDxGEeaNdvCpIK_eyQ" x="90" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_cwuBkjxGEeaNdvCpIK_eyQ"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_cwtagzxGEeaNdvCpIK_eyQ" name="LC1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_cwtahDxGEeaNdvCpIK_eyQ" labelPosition="node">
+          <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithLCNode']/@defaultLayer/@nodeMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithLCNode']/@defaultLayer/@nodeMappings[name='Package']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_cwtahTxGEeaNdvCpIK_eyQ" name="LC2" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_cwtahjxGEeaNdvCpIK_eyQ" labelPosition="node">
+          <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithLCNode']/@defaultLayer/@nodeMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithLCNode']/@defaultLayer/@nodeMappings[name='Package']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithLCNode']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_cwtahzxGEeaNdvCpIK_eyQ"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithLCNode']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_GiVIcDx1Eeah2bOjObX3AA" name="repDiamondAdaptedForCopyPasteFormatTest">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_GiVIcTx1Eeah2bOjObX3AA" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_GiVIcjx1Eeah2bOjObX3AA"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_Gi1ewDx1Eeah2bOjObX3AA" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_Gi1ewTx1Eeah2bOjObX3AA" type="Sirius" element="_GiVIcDx1Eeah2bOjObX3AA" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_Gi8McDx1Eeah2bOjObX3AA" type="2001" element="_GiVIczx1Eeah2bOjObX3AA">
+            <children xmi:type="notation:Node" xmi:id="_GjEvUDx1Eeah2bOjObX3AA" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_GjEvUTx1Eeah2bOjObX3AA" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_GjKO4Dx1Eeah2bOjObX3AA" type="3017" element="_GiVIdDx1Eeah2bOjObX3AA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_GjKO4Tx1Eeah2bOjObX3AA" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GjKO4jx1Eeah2bOjObX3AA"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_Gi8McTx1Eeah2bOjObX3AA" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gi8Mcjx1Eeah2bOjObX3AA" x="640" y="260" width="156" height="176"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_GjHLkDx1Eeah2bOjObX3AA" type="2001" element="_GiVIdTx1Eeah2bOjObX3AA">
+            <children xmi:type="notation:Node" xmi:id="_GjHyoDx1Eeah2bOjObX3AA" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_GjHyoTx1Eeah2bOjObX3AA" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_GjK18Dx1Eeah2bOjObX3AA" type="3017" element="_GiVIdjx1Eeah2bOjObX3AA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_GjK18Tx1Eeah2bOjObX3AA" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GjK18jx1Eeah2bOjObX3AA"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_GjHLkTx1Eeah2bOjObX3AA" fontColor="12560536" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GjHLkjx1Eeah2bOjObX3AA" x="830" y="25" width="400" height="400"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_Gi1ewjx1Eeah2bOjObX3AA"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_GiVIczx1Eeah2bOjObX3AA" name="LC1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_GiVIdDx1Eeah2bOjObX3AA" labelPosition="node" color="252,175,62">
+          <description xmi:type="style:LozengeNodeDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithOrangeDiamondLCNode']/@defaultLayer/@nodeMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithOrangeDiamondLCNode']/@defaultLayer/@nodeMappings[name='Package']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_GiVIdTx1Eeah2bOjObX3AA" name="LC2" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_GiVIdjx1Eeah2bOjObX3AA" labelColor="152,168,191" labelPosition="node" color="252,175,62">
+          <customFeatures>labelColor</customFeatures>
+          <description xmi:type="style:LozengeNodeDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithOrangeDiamondLCNode']/@defaultLayer/@nodeMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithOrangeDiamondLCNode']/@defaultLayer/@nodeMappings[name='Package']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithOrangeDiamondLCNode']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_GiVIdzx1Eeah2bOjObX3AA"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithOrangeDiamondLCNode']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_KdIxIDx1Eeah2bOjObX3AA" name="repEllipseAdaptedForCopyPasteFormatTest">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_KdIxITx1Eeah2bOjObX3AA" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_KdIxIjx1Eeah2bOjObX3AA"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_KdIxKDx1Eeah2bOjObX3AA" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_KdIxKTx1Eeah2bOjObX3AA" type="Sirius" element="_KdIxIDx1Eeah2bOjObX3AA" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_KdJYMDx1Eeah2bOjObX3AA" type="2001" element="_KdIxIzx1Eeah2bOjObX3AA">
+            <children xmi:type="notation:Node" xmi:id="_KdJYMzx1Eeah2bOjObX3AA" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_KdJYNDx1Eeah2bOjObX3AA" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_KdPe0Dx1Eeah2bOjObX3AA" type="3016" element="_KdIxJDx1Eeah2bOjObX3AA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_KdPe0Tx1Eeah2bOjObX3AA" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdPe0jx1Eeah2bOjObX3AA"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_KdJYMTx1Eeah2bOjObX3AA" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdJYMjx1Eeah2bOjObX3AA" x="540" y="255" width="301" height="136"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_KdJYNTx1Eeah2bOjObX3AA" type="2001" element="_KdIxJTx1Eeah2bOjObX3AA">
+            <children xmi:type="notation:Node" xmi:id="_KdJ_QDx1Eeah2bOjObX3AA" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_KdJ_QTx1Eeah2bOjObX3AA" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_KdQF4Dx1Eeah2bOjObX3AA" type="3016" element="_KdIxJjx1Eeah2bOjObX3AA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_KdQF4Tx1Eeah2bOjObX3AA" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdQF4jx1Eeah2bOjObX3AA"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_KdJYNjx1Eeah2bOjObX3AA" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdJYNzx1Eeah2bOjObX3AA" x="830" y="25" width="400" height="400"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_KdIxKjx1Eeah2bOjObX3AA"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_KdIxIzx1Eeah2bOjObX3AA" name="LC1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_KdIxJDx1Eeah2bOjObX3AA" labelPosition="node" color="252,233,79">
+          <description xmi:type="style:EllipseNodeDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithYellowEllipseLCNode']/@defaultLayer/@nodeMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithYellowEllipseLCNode']/@defaultLayer/@nodeMappings[name='Package']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_KdIxJTx1Eeah2bOjObX3AA" name="LC2" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_KdIxJjx1Eeah2bOjObX3AA" labelPosition="node" color="252,233,79">
+          <description xmi:type="style:EllipseNodeDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithYellowEllipseLCNode']/@defaultLayer/@nodeMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithYellowEllipseLCNode']/@defaultLayer/@nodeMappings[name='Package']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithYellowEllipseLCNode']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_KdIxJzx1Eeah2bOjObX3AA"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithYellowEllipseLCNode']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_Oy5QcDx1Eeah2bOjObX3AA" name="repImageAdaptedForCopyPasteFormatTest">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_Oy5QcTx1Eeah2bOjObX3AA" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_Oy5Qcjx1Eeah2bOjObX3AA"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_OzCaYDx1Eeah2bOjObX3AA" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_OzCaYTx1Eeah2bOjObX3AA" type="Sirius" element="_Oy5QcDx1Eeah2bOjObX3AA" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_OzCaYzx1Eeah2bOjObX3AA" type="2001" element="_Oy5Qczx1Eeah2bOjObX3AA">
+            <children xmi:type="notation:Node" xmi:id="_OzDBcDx1Eeah2bOjObX3AA" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_OzDBcTx1Eeah2bOjObX3AA" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_O6qFUDx1Eeah2bOjObX3AA" type="3005" element="_Oy5QdDx1Eeah2bOjObX3AA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_O6qFUTx1Eeah2bOjObX3AA" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O6qFUjx1Eeah2bOjObX3AA"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_OzCaZDx1Eeah2bOjObX3AA" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OzCaZTx1Eeah2bOjObX3AA" x="400" y="170" width="400" height="400"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_O6nCADx1Eeah2bOjObX3AA" type="2001" element="_Oy5QdTx1Eeah2bOjObX3AA">
+            <children xmi:type="notation:Node" xmi:id="_O6npEDx1Eeah2bOjObX3AA" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_O6npETx1Eeah2bOjObX3AA" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_O6qsYDx1Eeah2bOjObX3AA" type="3005" element="_Oy5Qdjx1Eeah2bOjObX3AA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_O6qsYTx1Eeah2bOjObX3AA" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O6qsYjx1Eeah2bOjObX3AA"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_O6nCATx1Eeah2bOjObX3AA" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O6nCAjx1Eeah2bOjObX3AA" x="830" y="25" width="400" height="400"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_OzCaYjx1Eeah2bOjObX3AA"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_Oy5Qczx1Eeah2bOjObX3AA" name="LC1" width="-1" height="-1" resizeKind="NSEW">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_Oy5QdDx1Eeah2bOjObX3AA" labelPosition="node" workspacePath="/DesignerTestProject/Tux.svg">
+          <description xmi:type="style:WorkspaceImageDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithImageLCNode']/@defaultLayer/@nodeMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithImageLCNode']/@defaultLayer/@nodeMappings[name='Package']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_Oy5QdTx1Eeah2bOjObX3AA" name="LC2" width="-1" height="-1" resizeKind="NSEW">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_Oy5Qdjx1Eeah2bOjObX3AA" labelPosition="node" workspacePath="/DesignerTestProject/Tux.svg">
+          <description xmi:type="style:WorkspaceImageDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithImageLCNode']/@defaultLayer/@nodeMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithImageLCNode']/@defaultLayer/@nodeMappings[name='Package']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithImageLCNode']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_Oy5Qdzx1Eeah2bOjObX3AA"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithImageLCNode']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_feoN8Dx1Eeah2bOjObX3AA" name="repSquareAdaptedForCopyPasteFormatTest">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_feoN8Tx1Eeah2bOjObX3AA" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_feoN8jx1Eeah2bOjObX3AA"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_feo1ADx1Eeah2bOjObX3AA" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_feo1ATx1Eeah2bOjObX3AA" type="Sirius" element="_feoN8Dx1Eeah2bOjObX3AA" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_feo1Azx1Eeah2bOjObX3AA" type="2001" element="_feoN8zx1Eeah2bOjObX3AA">
+            <children xmi:type="notation:Node" xmi:id="_fepcEDx1Eeah2bOjObX3AA" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_fepcETx1Eeah2bOjObX3AA" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_ferRQDx1Eeah2bOjObX3AA" type="3003" element="_feoN9Dx1Eeah2bOjObX3AA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ferRQTx1Eeah2bOjObX3AA" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ferRQjx1Eeah2bOjObX3AA"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_feo1BDx1Eeah2bOjObX3AA" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_feo1BTx1Eeah2bOjObX3AA" x="60" y="45" width="56" height="46"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_fepcEjx1Eeah2bOjObX3AA" type="2001" element="_feoN9Tx1Eeah2bOjObX3AA">
+            <children xmi:type="notation:Node" xmi:id="_feqDIDx1Eeah2bOjObX3AA" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_feqDITx1Eeah2bOjObX3AA" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_feuUkDx1Eeah2bOjObX3AA" type="3003" element="_feoN9jx1Eeah2bOjObX3AA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_feuUkTx1Eeah2bOjObX3AA" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_feuUkjx1Eeah2bOjObX3AA"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_fepcEzx1Eeah2bOjObX3AA" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fepcFDx1Eeah2bOjObX3AA" x="155" y="45" width="56" height="51"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_feo1Ajx1Eeah2bOjObX3AA"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_feoN8zx1Eeah2bOjObX3AA" name="LC1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_feoN9Dx1Eeah2bOjObX3AA" labelPosition="node">
+          <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithGrayLCNode']/@defaultLayer/@nodeMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithGrayLCNode']/@defaultLayer/@nodeMappings[name='Package']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_feoN9Tx1Eeah2bOjObX3AA" name="LC2" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_feoN9jx1Eeah2bOjObX3AA" labelPosition="node">
+          <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithGrayLCNode']/@defaultLayer/@nodeMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithGrayLCNode']/@defaultLayer/@nodeMappings[name='Package']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithGrayLCNode']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_feoN9zx1Eeah2bOjObX3AA"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithGrayLCNode']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_tyRyYDx4EeaMp4C8ECS8iQ" name="repSquareAdaptedForCopyPasteFormatTest">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_tyRyYTx4EeaMp4C8ECS8iQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_tyRyYjx4EeaMp4C8ECS8iQ"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_tysCEDx4EeaMp4C8ECS8iQ" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_tysCETx4EeaMp4C8ECS8iQ" type="Sirius" element="_tyRyYDx4EeaMp4C8ECS8iQ" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_ty3BMDx4EeaMp4C8ECS8iQ" type="2001" element="_tyRyYzx4EeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_ty_kEDx4EeaMp4C8ECS8iQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_ty_kETx4EeaMp4C8ECS8iQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_tzDOcDx4EeaMp4C8ECS8iQ" type="3003" element="_tyRyZDx4EeaMp4C8ECS8iQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_tzDOcTx4EeaMp4C8ECS8iQ" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tzDOcjx4EeaMp4C8ECS8iQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ty3BMTx4EeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ty3BMjx4EeaMp4C8ECS8iQ" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_tzBZQDx4EeaMp4C8ECS8iQ" type="2001" element="_tyRyZTx4EeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_tzCAUDx4EeaMp4C8ECS8iQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_tzCAUTx4EeaMp4C8ECS8iQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_tzEckDx4EeaMp4C8ECS8iQ" type="3003" element="_tyRyZjx4EeaMp4C8ECS8iQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_tzEckTx4EeaMp4C8ECS8iQ" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tzEckjx4EeaMp4C8ECS8iQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_tzBZQTx4EeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tzBZQjx4EeaMp4C8ECS8iQ" x="90" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_tysCEjx4EeaMp4C8ECS8iQ"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_tyRyYzx4EeaMp4C8ECS8iQ" name="LC1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_tyRyZDx4EeaMp4C8ECS8iQ" labelPosition="node">
+          <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithSquareLCNode']/@defaultLayer/@nodeMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithSquareLCNode']/@defaultLayer/@nodeMappings[name='Package']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_tyRyZTx4EeaMp4C8ECS8iQ" name="LC2" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_tyRyZjx4EeaMp4C8ECS8iQ" labelPosition="node">
+          <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithSquareLCNode']/@defaultLayer/@nodeMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithSquareLCNode']/@defaultLayer/@nodeMappings[name='Package']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithSquareLCNode']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_tyRyZzx4EeaMp4C8ECS8iQ"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='DiagramWithSquareLCNode']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_Fqr4MD4JEeaeQbm-KV8sCg" name="rep4AdaptedForCopyPasteFormatTest">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_Fqr4MT4JEeaeQbm-KV8sCg" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_Fqr4Mj4JEeaeQbm-KV8sCg"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_FrABQD4JEeaeQbm-KV8sCg" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_FrABQT4JEeaeQbm-KV8sCg" type="Sirius" element="_Fqr4MD4JEeaeQbm-KV8sCg" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_FrLAYD4JEeaeQbm-KV8sCg" type="2002" element="_Fqr4Mz4JEeaeQbm-KV8sCg">
+            <children xmi:type="notation:Node" xmi:id="_FrRuED4JEeaeQbm-KV8sCg" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_FrS8MD4JEeaeQbm-KV8sCg" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_FrV_gD4JEeaeQbm-KV8sCg" type="3007" element="_Fqr4NT4JEeaeQbm-KV8sCg">
+                <children xmi:type="notation:Node" xmi:id="_FrX0sD4JEeaeQbm-KV8sCg" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_H9OikT4JEeaeQbm-KV8sCg" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Fra4AD4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4Nj4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_FrbfED4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9OikD4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_Fro6cD4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4Nz4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_Fro6cT4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fro6cj4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Fra4AT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9N7hj4JEeaeQbm-KV8sCg" x="48" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_FrfwgD4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4OD4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_FrgXkD4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9NUcz4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_FrphgD4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4OT4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_FrphgT4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Frphgj4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_FrfwgT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9NUcj4JEeaeQbm-KV8sCg" x="60" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Frg-oD4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4Oj4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_Frg-oz4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9NUcT4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_FrqvoD4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4Oz4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_FrqvoT4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Frqvoj4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Frg-oT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9NUcD4JEeaeQbm-KV8sCg" x="144" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_FrhlsT4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4PD4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_FriMwD4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9NUdz4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_FrrWsD4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4PT4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_FrrWsT4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FrrWsj4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Frhlsj4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9NUdj4JEeaeQbm-KV8sCg" x="84" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Friz0D4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4Pj4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_Frja4D4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9NUdT4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_FrrWsz4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4Pz4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_FrrWtD4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FrrWtT4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Friz0T4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9NUdD4JEeaeQbm-KV8sCg" x="72" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_FrlQED4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4QD4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_Frl3ID4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9N7hT4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_Frr9wD4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4QT4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_Frr9wT4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Frr9wj4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_FrlQET4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9N7hD4JEeaeQbm-KV8sCg" x="132" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_FrmeMD4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4Qj4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_FrnFQD4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9N7gT4JEeaeQbm-KV8sCg" x="11" y="-9"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_Frr9wz4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4Qz4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_Frr9xD4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Frr9xT4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_FrmeMT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9N7gD4JEeaeQbm-KV8sCg" x="-2" y="48" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_FroTYD4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4RD4JEeaeQbm-KV8sCg">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_FroTYT4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FroTYj4JEeaeQbm-KV8sCg"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_FrV_gT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9MtYT4JEeaeQbm-KV8sCg" x="55" y="30" width="206" height="169"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_FrS8MT4JEeaeQbm-KV8sCg"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_FrS8Mj4JEeaeQbm-KV8sCg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_FrLAYT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9MtYD4JEeaeQbm-KV8sCg" x="96" y="96" width="363" height="255"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_FrUKUD4JEeaeQbm-KV8sCg" type="2002" element="_Fqr4RT4JEeaeQbm-KV8sCg">
+            <children xmi:type="notation:Node" xmi:id="_FrUxYD4JEeaeQbm-KV8sCg" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_FrUxYT4JEeaeQbm-KV8sCg" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_Frsk0D4JEeaeQbm-KV8sCg" type="3007" element="_Fqr4Rz4JEeaeQbm-KV8sCg">
+                <children xmi:type="notation:Node" xmi:id="_Frsk0z4JEeaeQbm-KV8sCg" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_H9Pwsz4JEeaeQbm-KV8sCg" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Frsk1T4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4SD4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_FrtL4D4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9PJqT4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_Fr8ccD4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4ST4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr8ccT4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fr8ccj4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Frsk1j4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9PJqD4JEeaeQbm-KV8sCg" x="1" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_FryEYD4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4Sj4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_FryEYz4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9PJpz4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_Fr8ccz4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4Sz4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr8cdD4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fr8cdT4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_FryEYT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9PJpj4JEeaeQbm-KV8sCg" x="24" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_FrzSgD4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4TD4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_Frz5kD4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9PJrT4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_Fr9DgD4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4TT4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr9DgT4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fr9Dgj4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_FrzSgT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9PJrD4JEeaeQbm-KV8sCg" x="85" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Fr0goD4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4Tj4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_Fr1HsD4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9PJqz4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_Fr9Dgz4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4Tz4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr9DhD4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fr9DhT4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr0goT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9PJqj4JEeaeQbm-KV8sCg" x="156" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Fr1uwD4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4UD4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_Fr2V0D4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9OilT4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_Fr9Dhj4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4UT4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr9Dhz4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fr9DiD4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr1uwT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9OilD4JEeaeQbm-KV8sCg" x="48" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Fr284D4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4Uj4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_Fr3j8D4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9PJoT4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_Fr9qkD4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4Uz4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr9qkT4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fr9qkj4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr284T4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9PJoD4JEeaeQbm-KV8sCg" x="132" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Fr4LAD4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4VD4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_Fr6AMD4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9PwsD4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_Fr9qkz4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4VT4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr9qlD4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fr9qlT4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr4LAT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9PJrj4JEeaeQbm-KV8sCg" x="120" y="-2" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Fr6nQD4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4Vj4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_Fr6nQz4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9Pwsj4JEeaeQbm-KV8sCg" x="-25" y="1"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_Fr-RoD4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4Vz4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr-RoT4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fr-Roj4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr6nQT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9PwsT4JEeaeQbm-KV8sCg" x="108" y="125" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Fr7OUD4JEeaeQbm-KV8sCg" type="3001" element="_Fqr4WD4JEeaeQbm-KV8sCg">
+                  <children xmi:type="notation:Node" xmi:id="_Fr71YD4JEeaeQbm-KV8sCg" type="5001">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_H9PJoz4JEeaeQbm-KV8sCg" x="11" y="-9"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_Fr-Roz4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4WT4JEeaeQbm-KV8sCg">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr-RpD4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fr-RpT4JEeaeQbm-KV8sCg"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr7OUT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9PJoj4JEeaeQbm-KV8sCg" x="-2" y="9" width="10" height="10"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Fr71Yj4JEeaeQbm-KV8sCg" type="3003" element="_Fqr4Wj4JEeaeQbm-KV8sCg">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Fr71Yz4JEeaeQbm-KV8sCg" fontName="Segoe UI"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fr71ZD4JEeaeQbm-KV8sCg"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_Frsk0T4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9Oikz4JEeaeQbm-KV8sCg" x="55" y="30" width="182" height="133"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_FrUxYj4JEeaeQbm-KV8sCg"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_FrUxYz4JEeaeQbm-KV8sCg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_FrUKUT4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9Oikj4JEeaeQbm-KV8sCg" x="600" y="72" width="291" height="243"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_FrABQj4JEeaeQbm-KV8sCg"/>
+          <edges xmi:type="notation:Edge" xmi:id="_FsBU8D4JEeaeQbm-KV8sCg" type="4001" element="_Fqr4Wz4JEeaeQbm-KV8sCg" source="_FrmeMD4JEeaeQbm-KV8sCg" target="_Frsk1T4JEeaeQbm-KV8sCg">
+            <children xmi:type="notation:Node" xmi:id="_FsCjED4JEeaeQbm-KV8sCg" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9N7gz4JEeaeQbm-KV8sCg" x="1" y="-12"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_FsDKID4JEeaeQbm-KV8sCg" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FsDKIT4JEeaeQbm-KV8sCg" y="9"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_FsE_UD4JEeaeQbm-KV8sCg" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FsE_UT4JEeaeQbm-KV8sCg" y="9"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_FsBU8T4JEeaeQbm-KV8sCg"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_FsBU8j4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H9N7gj4JEeaeQbm-KV8sCg" points="[5, -1, -502, 73]$[502, -74, -5, 0]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FsIpsD4JEeaeQbm-KV8sCg" id="(0.5,0.5)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FsIpsT4JEeaeQbm-KV8sCg" id="(0.5,0.5)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_FsJQwD4JEeaeQbm-KV8sCg" type="4001" element="_Fqr4Xj4JEeaeQbm-KV8sCg" source="_Fr7OUD4JEeaeQbm-KV8sCg" target="_Fra4AD4JEeaeQbm-KV8sCg">
+            <children xmi:type="notation:Node" xmi:id="_FsJQxD4JEeaeQbm-KV8sCg" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9PJpT4JEeaeQbm-KV8sCg" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_FsJQxj4JEeaeQbm-KV8sCg" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FsJQxz4JEeaeQbm-KV8sCg" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_FsJQyD4JEeaeQbm-KV8sCg" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FsJQyT4JEeaeQbm-KV8sCg" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_FsJQwT4JEeaeQbm-KV8sCg"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_FsJQwj4JEeaeQbm-KV8sCg" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H9PJpD4JEeaeQbm-KV8sCg" points="[-5, 0, 449, -13]$[-449, 12, 5, -1]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FsJ30D4JEeaeQbm-KV8sCg" id="(0.5,0.5)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FsJ30T4JEeaeQbm-KV8sCg" id="(0.5,0.5)"/>
+          </edges>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_Fqr4Mz4JEeaeQbm-KV8sCg" name="LC1">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC1"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Fqr4ND4JEeaeQbm-KV8sCg" borderSize="1" borderSizeComputationExpression="1" backgroundColor="194,239,255" foregroundColor="39,76,114">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']"/>
+        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_Fqr4NT4JEeaeQbm-KV8sCg" name="LogicalFunction1" width="3" height="3" resizeKind="NSEW">
+          <target xmi:type="ecore:EClass" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1"/>
+          <semanticElements xmi:type="ecore:EClass" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1"/>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4Nj4JEeaeQbm-KV8sCg" name="a1" incomingEdges="_Fqr4Xj4JEeaeQbm-KV8sCg" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a1"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a1"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4Nz4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4OD4JEeaeQbm-KV8sCg" name="a2" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a2"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a2"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4OT4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4Oj4JEeaeQbm-KV8sCg" name="a3" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a3"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a3"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4Oz4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4PD4JEeaeQbm-KV8sCg" name="a4" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a4"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a4"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4PT4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4Pj4JEeaeQbm-KV8sCg" name="a5" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a5"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a5"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4Pz4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4QD4JEeaeQbm-KV8sCg" name="a6" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a6"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/a6"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4QT4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4Qj4JEeaeQbm-KV8sCg" name="r1" outgoingEdges="_Fqr4Wz4JEeaeQbm-KV8sCg" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/r1"/>
+            <semanticElements xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/r1"/>
+            <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+            <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+            <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4Qz4JEeaeQbm-KV8sCg" color="194,239,255">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']"/>
+          </ownedBorderedNodes>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4RD4JEeaeQbm-KV8sCg" labelPosition="node" color="138,226,52">
+            <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']"/>
+        </ownedDiagramElements>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_Fqr4RT4JEeaeQbm-KV8sCg" name="LC2">
+        <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <semanticElements xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem/LC2"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Fqr4Rj4JEeaeQbm-KV8sCg" borderSize="1" borderSizeComputationExpression="1" backgroundColor="194,239,255" foregroundColor="39,76,114">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']"/>
+        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_Fqr4Rz4JEeaeQbm-KV8sCg" name="LogicalFunction2" width="3" height="3" resizeKind="NSEW">
+          <target xmi:type="ecore:EClass" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2"/>
+          <semanticElements xmi:type="ecore:EClass" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2"/>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4SD4JEeaeQbm-KV8sCg" name="b1" incomingEdges="_Fqr4Wz4JEeaeQbm-KV8sCg" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b1"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b1"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4ST4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4Sj4JEeaeQbm-KV8sCg" name="b2" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b2"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b2"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4Sz4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4TD4JEeaeQbm-KV8sCg" name="b3" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b3"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b3"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4TT4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4Tj4JEeaeQbm-KV8sCg" name="b4" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b4"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b4"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4Tz4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4UD4JEeaeQbm-KV8sCg" name="b5" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b5"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b5"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4UT4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4Uj4JEeaeQbm-KV8sCg" name="b6" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b6"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b6"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4Uz4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4VD4JEeaeQbm-KV8sCg" name="b7" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b7"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b7"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4VT4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4Vj4JEeaeQbm-KV8sCg" name="b8" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b8"/>
+            <semanticElements xmi:type="ecore:EAttribute" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/b8"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4Vz4JEeaeQbm-KV8sCg" color="252,175,62">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Fqr4WD4JEeaeQbm-KV8sCg" name="r2" outgoingEdges="_Fqr4Xj4JEeaeQbm-KV8sCg" width="1" height="1" resizeKind="NSEW">
+            <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/r2"/>
+            <semanticElements xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/r2"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4WT4JEeaeQbm-KV8sCg" color="194,239,255">
+              <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']"/>
+          </ownedBorderedNodes>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_Fqr4Wj4JEeaeQbm-KV8sCg" labelPosition="node" color="138,226,52">
+            <description xmi:type="style:SquareDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:NodeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']"/>
+        </ownedDiagramElements>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Fqr4Wz4JEeaeQbm-KV8sCg" sourceNode="_Fqr4Qj4JEeaeQbm-KV8sCg" targetNode="_Fqr4SD4JEeaeQbm-KV8sCg">
+        <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC1/LogicalFunction1/r1"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Fqr4XD4JEeaeQbm-KV8sCg" size="2">
+          <description xmi:type="style:EdgeStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']/@style"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Fqr4XT4JEeaeQbm-KV8sCg"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Fqr4Xj4JEeaeQbm-KV8sCg" sourceNode="_Fqr4WD4JEeaeQbm-KV8sCg" targetNode="_Fqr4Nj4JEeaeQbm-KV8sCg">
+        <target xmi:type="ecore:EReference" href="VP-3601.ecore#//LogicalSystem/LC2/LogicalFunction2/r2"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Fqr4Xz4JEeaeQbm-KV8sCg" size="2">
+          <description xmi:type="style:EdgeStyleDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']/@style"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Fqr4YD4JEeaeQbm-KV8sCg"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='ref']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_Fqr4YT4JEeaeQbm-KV8sCg"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VP-3601.odesign#//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="VP-3601.ecore#//LogicalSystem"/>
+    </ownedRepresentations>
   </ownedViews>
 </viewpoint:DAnalysis>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.ecore b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.ecore
index f37df4eb2e..c49ef21760 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.ecore
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.ecore
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="root">
   <eSubpackages name="LogicalSystem" nsPrefix="">
     <eSubpackages name="LC1">
+      <eAnnotations source="refinement.link" references="#//LogicalSystem/LC2"/>
       <eClassifiers xsi:type="ecore:EClass" name="LogicalFunction1">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="a1"/>
+        <eAnnotations source="refinement.link" references="#//LogicalSystem/LC2/LogicalFunction2"/>
+        <eStructuralFeatures xsi:type="ecore:EAttribute" name="a1">
+          <eAnnotations source="refinement.link" references="#//LogicalSystem/LC2/LogicalFunction2/b1"/>
+        </eStructuralFeatures>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="a2"/>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="a3"/>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="a4"/>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.odesign
index b2863063e4..029ed7b73f 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.odesign
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group 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:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="10.1.3.201511131800">
+<description:Group 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:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="11.0.0.201601261200">
   <ownedViewpoints name="Doremi-2842">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram" domainClass="EPackage">
       <filters xsi:type="filter:CompositeFilterDescription" name="test">
@@ -51,5 +51,48 @@
         </containerMappings>
       </defaultLayer>
     </ownedRepresentations>
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramWithSquareLCNode" domainClass="EPackage">
+      <defaultLayer name="Default">
+        <nodeMappings name="Package" semanticCandidatesExpression="[eContents(EPackage)/]" domainClass="EPackage">
+          <style xsi:type="style:SquareDescription" labelPosition="node" resizeKind="NSEW">
+            <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+          </style>
+        </nodeMappings>
+      </defaultLayer>
+    </ownedRepresentations>
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramWithOrangeDiamondLCNode" domainClass="EPackage">
+      <defaultLayer name="Default">
+        <nodeMappings name="Package" semanticCandidatesExpression="[eContents(EPackage)/]" domainClass="EPackage">
+          <style xsi:type="style:LozengeNodeDescription" labelPosition="node" resizeKind="NSEW">
+            <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
+          </style>
+        </nodeMappings>
+      </defaultLayer>
+    </ownedRepresentations>
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramWithYellowEllipseLCNode" domainClass="EPackage">
+      <defaultLayer name="Default">
+        <nodeMappings name="Package" semanticCandidatesExpression="[eContents(EPackage)/]" domainClass="EPackage">
+          <style xsi:type="style:EllipseNodeDescription" labelPosition="node" resizeKind="NSEW">
+            <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/>
+          </style>
+        </nodeMappings>
+      </defaultLayer>
+    </ownedRepresentations>
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramWithImageLCNode" domainClass="EPackage">
+      <defaultLayer name="Default">
+        <nodeMappings name="Package" semanticCandidatesExpression="[eContents(EPackage)/]" domainClass="EPackage">
+          <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" labelPosition="node" resizeKind="NSEW" workspacePath="/DesignerTestProject/Tux.svg">
+            <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </style>
+        </nodeMappings>
+      </defaultLayer>
+    </ownedRepresentations>
   </ownedViewpoints>
 </description:Group>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.aird b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.aird
index e7eaf9c7c2..b417495b75 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.aird
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.aird
@@ -1,7 +1,8 @@
 <?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/1.1.0#//diagram/description http://www.eclipse.org/sirius/diagram/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram/description/style" xmi:id="_HEV5gM8aEeGuHKI_M-vY-g" selectedViews="_H8wIMM8aEeGuHKI_M-vY-g" version="8.0.0">
-  <models xmi:type="ecore:EPackage" href="My.ecore#/"/>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_H8wIMM8aEeGuHKI_M-vY-g" initialized="true">
+<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="_HEV5gM8aEeGuHKI_M-vY-g" selectedViews="_H8wIMM8aEeGuHKI_M-vY-g" version="11.0.0.201604141600">
+  <semanticResources>My.ecore</semanticResources>
+  <ownedViews xmi:type="viewpoint:DView" xmi:id="_H8wIMM8aEeGuHKI_M-vY-g">
+    <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
     <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_INRQcM8aEeGuHKI_M-vY-g" name="root package entities">
       <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_INaaYM8aEeGuHKI_M-vY-g" source="GMF_DIAGRAMS">
         <data xmi:type="notation:Diagram" xmi:id="_INaaYc8aEeGuHKI_M-vY-g" type="Sirius" element="_INRQcM8aEeGuHKI_M-vY-g" measurementUnit="Pixel">
@@ -72,27 +73,22 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_5_QtYD0MEeaMp4C8ECS8iQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_5_QtYT0MEeaMp4C8ECS8iQ"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_d_eYgM8aEeGuHKI_M-vY-g" name="NewEClass1" tooltipText="root.NewEClass1" outgoingEdges="_gGyDQM8aEeGuHKI_M-vY-g">
         <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass1"/>
         <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass1"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_eAqEQM8aEeGuHKI_M-vY-g" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_eAqEQc8aEeGuHKI_M-vY-g"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_eAqEQM8aEeGuHKI_M-vY-g" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_eAqEQs8aEeGuHKI_M-vY-g"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_eAqEQ88aEeGuHKI_M-vY-g" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_eAqERM8aEeGuHKI_M-vY-g" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_eRt_EM8aEeGuHKI_M-vY-g" name="NewEClass2" tooltipText="root.NewEClass2" incomingEdges="_gGyDQM8aEeGuHKI_M-vY-g">
         <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass2"/>
         <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_eRyQgM8aEeGuHKI_M-vY-g" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_eRyQgc8aEeGuHKI_M-vY-g"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_eRyQgM8aEeGuHKI_M-vY-g" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_eRyQgs8aEeGuHKI_M-vY-g"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_eRyQg88aEeGuHKI_M-vY-g" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_eRyQhM8aEeGuHKI_M-vY-g" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -111,10 +107,7 @@
           <customFeatures>centerLabelStyle</customFeatures>
           <customFeatures>endLabelStyle</customFeatures>
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_gInPQc8aEeGuHKI_M-vY-g" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_gInPQs8aEeGuHKI_M-vY-g" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_gInPQ88aEeGuHKI_M-vY-g"/>
-          </centerLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_gInPQs8aEeGuHKI_M-vY-g" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -124,12 +117,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_hNXQ0M8aEeGuHKI_M-vY-g" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_hNXQ0c8aEeGuHKI_M-vY-g"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_hNXQ0M8aEeGuHKI_M-vY-g" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_hNXQ0s8aEeGuHKI_M-vY-g"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_hNXQ088aEeGuHKI_M-vY-g" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_hNXQ1M8aEeGuHKI_M-vY-g" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -139,12 +128,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_huHNcM8aEeGuHKI_M-vY-g" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_huHNcc8aEeGuHKI_M-vY-g"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_huHNcM8aEeGuHKI_M-vY-g" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_huHNcs8aEeGuHKI_M-vY-g"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_huHNc88aEeGuHKI_M-vY-g" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_huHNdM8aEeGuHKI_M-vY-g" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -153,10 +138,7 @@
         <semanticElements xmi:type="ecore:EReference" href="My.ecore#//NewEClass3/newEReference2"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_gGdBMM8cEeGuHKI_M-vY-g">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_gGdBMc8cEeGuHKI_M-vY-g" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_gGdBMs8cEeGuHKI_M-vY-g" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_gGdBM88cEeGuHKI_M-vY-g"/>
-          </centerLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_gGdBMs8cEeGuHKI_M-vY-g" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -240,51 +222,38 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_5_vOgD0MEeaMp4C8ECS8iQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_5_vOgT0MEeaMp4C8ECS8iQ"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_ccdjQc8-EeGZ3o99TDZnpA" name="NewEClass1" tooltipText="root.NewEClass1" outgoingEdges="_ccdjZc8-EeGZ3o99TDZnpA">
         <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass1"/>
         <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass1"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ccdjQs8-EeGZ3o99TDZnpA" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjQ88-EeGZ3o99TDZnpA"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ccdjQs8-EeGZ3o99TDZnpA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjRM8-EeGZ3o99TDZnpA"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjRc8-EeGZ3o99TDZnpA" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjRs8-EeGZ3o99TDZnpA" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_ccdjR88-EeGZ3o99TDZnpA" name="NewEClass2" tooltipText="root.NewEClass2" incomingEdges="_ccdjZc8-EeGZ3o99TDZnpA">
         <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass2"/>
         <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ccdjSM8-EeGZ3o99TDZnpA" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjSc8-EeGZ3o99TDZnpA"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ccdjSM8-EeGZ3o99TDZnpA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjSs8-EeGZ3o99TDZnpA"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjS88-EeGZ3o99TDZnpA" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjTM8-EeGZ3o99TDZnpA" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_ccdjTc8-EeGZ3o99TDZnpA" name="NewEClass3" tooltipText="root.NewEClass3" outgoingEdges="_ccdjas8-EeGZ3o99TDZnpA">
         <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass3"/>
         <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass3"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ccdjTs8-EeGZ3o99TDZnpA" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjT88-EeGZ3o99TDZnpA"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ccdjTs8-EeGZ3o99TDZnpA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjUM8-EeGZ3o99TDZnpA"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjUc8-EeGZ3o99TDZnpA" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjUs8-EeGZ3o99TDZnpA" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_ccdjU88-EeGZ3o99TDZnpA" name="NewEClass4" tooltipText="root.NewEClass4" incomingEdges="_ccdjas8-EeGZ3o99TDZnpA">
         <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass4"/>
         <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass4"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ccdjVM8-EeGZ3o99TDZnpA" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjVc8-EeGZ3o99TDZnpA"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ccdjVM8-EeGZ3o99TDZnpA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjVs8-EeGZ3o99TDZnpA"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjV88-EeGZ3o99TDZnpA" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjWM8-EeGZ3o99TDZnpA" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -293,10 +262,7 @@
         <semanticElements xmi:type="ecore:EReference" href="My.ecore#//NewEClass1/newEReference1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_ccdjZs8-EeGZ3o99TDZnpA">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjZ88-EeGZ3o99TDZnpA" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_ccdjaM8-EeGZ3o99TDZnpA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjac8-EeGZ3o99TDZnpA"/>
-          </centerLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_ccdjaM8-EeGZ3o99TDZnpA" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -305,10 +271,7 @@
         <semanticElements xmi:type="ecore:EReference" href="My.ecore#//NewEClass3/newEReference2"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_ccdja88-EeGZ3o99TDZnpA">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjbM8-EeGZ3o99TDZnpA" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_ccdjbc8-EeGZ3o99TDZnpA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ccdjbs8-EeGZ3o99TDZnpA"/>
-          </centerLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_ccdjbc8-EeGZ3o99TDZnpA" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -318,6 +281,269 @@
       <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
       <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
     </ownedRepresentations>
-    <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_I9EJcD0NEeaMp4C8ECS8iQ" name="rootPackageEntitiesSansLayoutAdaptedForCopyPasteFormatTest">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_I9EJcT0NEeaMp4C8ECS8iQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_I9EJcj0NEeaMp4C8ECS8iQ"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_I9EJgj0NEeaMp4C8ECS8iQ" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_I9EJgz0NEeaMp4C8ECS8iQ" type="Sirius" element="_I9EJcD0NEeaMp4C8ECS8iQ" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_I9EwgD0NEeaMp4C8ECS8iQ" type="2003" element="_I9EJcz0NEeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_I9Ewgz0NEeaMp4C8ECS8iQ" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_I9EwhD0NEeaMp4C8ECS8iQ" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_I9EwhT0NEeaMp4C8ECS8iQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_I9Ewhj0NEeaMp4C8ECS8iQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_I9EwgT0NEeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9Ewgj0NEeaMp4C8ECS8iQ" y="100"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_I9Ewhz0NEeaMp4C8ECS8iQ" type="2003" element="_I9EJdT0NEeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_I9Ewij0NEeaMp4C8ECS8iQ" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_I9FXkD0NEeaMp4C8ECS8iQ" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_I9FXkT0NEeaMp4C8ECS8iQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_I9FXkj0NEeaMp4C8ECS8iQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_I9EwiD0NEeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9EwiT0NEeaMp4C8ECS8iQ"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_I9FXkz0NEeaMp4C8ECS8iQ" type="2003" element="_I9EJdz0NEeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_I9FXlj0NEeaMp4C8ECS8iQ" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_I9FXlz0NEeaMp4C8ECS8iQ" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_I9FXmD0NEeaMp4C8ECS8iQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_I9FXmT0NEeaMp4C8ECS8iQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_I9FXlD0NEeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9FXlT0NEeaMp4C8ECS8iQ" x="115" y="100"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_I9FXmj0NEeaMp4C8ECS8iQ" type="2003" element="_I9EJeT0NEeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_I9F-oD0NEeaMp4C8ECS8iQ" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_I9F-oT0NEeaMp4C8ECS8iQ" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_I9F-oj0NEeaMp4C8ECS8iQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_I9F-oz0NEeaMp4C8ECS8iQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_I9FXmz0NEeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9FXnD0NEeaMp4C8ECS8iQ" x="115"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_I9EJhD0NEeaMp4C8ECS8iQ"/>
+          <edges xmi:type="notation:Edge" xmi:id="_I9GlsD0NEeaMp4C8ECS8iQ" type="4001" element="_I9EJez0NEeaMp4C8ECS8iQ" source="_I9EwgD0NEeaMp4C8ECS8iQ" target="_I9Ewhz0NEeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_I9HMwD0NEeaMp4C8ECS8iQ" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9HMwT0NEeaMp4C8ECS8iQ" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_I9HMwj0NEeaMp4C8ECS8iQ" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9HMwz0NEeaMp4C8ECS8iQ" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_I9HMxD0NEeaMp4C8ECS8iQ" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9HMxT0NEeaMp4C8ECS8iQ" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_I9GlsT0NEeaMp4C8ECS8iQ"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_I9Glsj0NEeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I9Glsz0NEeaMp4C8ECS8iQ" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I9HMxj0NEeaMp4C8ECS8iQ" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I9HMxz0NEeaMp4C8ECS8iQ" id="(0.5,1.0)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_I9HMyD0NEeaMp4C8ECS8iQ" type="4001" element="_I9EJfj0NEeaMp4C8ECS8iQ" source="_I9FXkz0NEeaMp4C8ECS8iQ" target="_I9FXmj0NEeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_I9Hz0D0NEeaMp4C8ECS8iQ" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9Hz0T0NEeaMp4C8ECS8iQ" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_I9Hz0j0NEeaMp4C8ECS8iQ" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9Hz0z0NEeaMp4C8ECS8iQ" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_I9Hz1D0NEeaMp4C8ECS8iQ" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9Hz1T0NEeaMp4C8ECS8iQ" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_I9HMyT0NEeaMp4C8ECS8iQ"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_I9HMyj0NEeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I9HMyz0NEeaMp4C8ECS8iQ" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I9Ia4D0NEeaMp4C8ECS8iQ" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I9Ia4T0NEeaMp4C8ECS8iQ" id="(0.5,1.0)"/>
+          </edges>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_I9EJcz0NEeaMp4C8ECS8iQ" name="NewEClass1" tooltipText="root.NewEClass1" outgoingEdges="_I9EJez0NEeaMp4C8ECS8iQ">
+        <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass1"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_I9EJdD0NEeaMp4C8ECS8iQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_I9EJdT0NEeaMp4C8ECS8iQ" name="NewEClass2" tooltipText="root.NewEClass2" incomingEdges="_I9EJez0NEeaMp4C8ECS8iQ">
+        <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass2"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_I9EJdj0NEeaMp4C8ECS8iQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_I9EJdz0NEeaMp4C8ECS8iQ" name="NewEClass3" tooltipText="root.NewEClass3" outgoingEdges="_I9EJfj0NEeaMp4C8ECS8iQ">
+        <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass3"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass3"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_I9EJeD0NEeaMp4C8ECS8iQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_I9EJeT0NEeaMp4C8ECS8iQ" name="NewEClass4" tooltipText="root.NewEClass4" incomingEdges="_I9EJfj0NEeaMp4C8ECS8iQ">
+        <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass4"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass4"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_I9EJej0NEeaMp4C8ECS8iQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_I9EJez0NEeaMp4C8ECS8iQ" name="[0..1] newEReference1" sourceNode="_I9EJcz0NEeaMp4C8ECS8iQ" targetNode="_I9EJdT0NEeaMp4C8ECS8iQ">
+        <target xmi:type="ecore:EReference" href="My.ecore#//NewEClass1/newEReference1"/>
+        <semanticElements xmi:type="ecore:EReference" href="My.ecore#//NewEClass1/newEReference1"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_I9EJfD0NEeaMp4C8ECS8iQ">
+          <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_I9EJfT0NEeaMp4C8ECS8iQ" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_I9EJfj0NEeaMp4C8ECS8iQ" name="[0..1] newEReference2" sourceNode="_I9EJdz0NEeaMp4C8ECS8iQ" targetNode="_I9EJeT0NEeaMp4C8ECS8iQ">
+        <target xmi:type="ecore:EReference" href="My.ecore#//NewEClass3/newEReference2"/>
+        <semanticElements xmi:type="ecore:EReference" href="My.ecore#//NewEClass3/newEReference2"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_I9EJfz0NEeaMp4C8ECS8iQ">
+          <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_I9EJgD0NEeaMp4C8ECS8iQ" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_I9EJgT0NEeaMp4C8ECS8iQ"/>
+      <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
+      <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
+      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_LDBJUD0NEeaMp4C8ECS8iQ" name="rootPackageEntitiesAdaptedForCopyPasteFormatTest">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_LDBJUT0NEeaMp4C8ECS8iQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_LDBJUj0NEeaMp4C8ECS8iQ"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_LDCXcD0NEeaMp4C8ECS8iQ" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_LDCXcT0NEeaMp4C8ECS8iQ" type="Sirius" element="_LDBJUD0NEeaMp4C8ECS8iQ" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_LDCXcz0NEeaMp4C8ECS8iQ" type="2003" element="_LDBJUz0NEeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_LDC-gD0NEeaMp4C8ECS8iQ" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_LDC-gT0NEeaMp4C8ECS8iQ" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_LDC-gj0NEeaMp4C8ECS8iQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_LDC-gz0NEeaMp4C8ECS8iQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_LDCXdD0NEeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ni66QD0NEeaMp4C8ECS8iQ" x="102" y="174" width="84" height="41"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_LDC-hD0NEeaMp4C8ECS8iQ" type="2003" element="_LDBJVT0NEeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_LDDlkD0NEeaMp4C8ECS8iQ" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_LDDlkT0NEeaMp4C8ECS8iQ" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_LDDlkj0NEeaMp4C8ECS8iQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_LDDlkz0NEeaMp4C8ECS8iQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_LDC-hT0NEeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ni66Qz0NEeaMp4C8ECS8iQ" x="520" y="165" width="84" height="41"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_LDDllD0NEeaMp4C8ECS8iQ" type="2003" element="_LDBJVz0NEeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_LDEMoD0NEeaMp4C8ECS8iQ" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_LDEMoT0NEeaMp4C8ECS8iQ" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_LDEMoj0NEeaMp4C8ECS8iQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_LDEMoz0NEeaMp4C8ECS8iQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_LDDllT0NEeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ni66RD0NEeaMp4C8ECS8iQ" x="275" y="435" width="84" height="41"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_LDoNUD0NEeaMp4C8ECS8iQ" type="2003" element="_LDBJWT0NEeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_LDpbcD0NEeaMp4C8ECS8iQ" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_LDqCgD0NEeaMp4C8ECS8iQ" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_LDqCgT0NEeaMp4C8ECS8iQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_LDqCgj0NEeaMp4C8ECS8iQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_LDoNUT0NEeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ni66Rz0NEeaMp4C8ECS8iQ" x="480" y="30" width="84" height="41"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_LDCXcj0NEeaMp4C8ECS8iQ"/>
+          <edges xmi:type="notation:Edge" xmi:id="_LDqCgz0NEeaMp4C8ECS8iQ" type="4001" element="_LDBJWz0NEeaMp4C8ECS8iQ" source="_LDCXcz0NEeaMp4C8ECS8iQ" target="_LDC-hD0NEeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_LDqpkD0NEeaMp4C8ECS8iQ" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ni66Qj0NEeaMp4C8ECS8iQ" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_LDqpkj0NEeaMp4C8ECS8iQ" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LDqpkz0NEeaMp4C8ECS8iQ" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_LDqplD0NEeaMp4C8ECS8iQ" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LDqplT0NEeaMp4C8ECS8iQ" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_LDqChD0NEeaMp4C8ECS8iQ" routing="Rectilinear" jumpLinkStatus="Above" jumpLinkType="Chamfered" jumpLinksReverse="true"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_LDqChT0NEeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ni66QT0NEeaMp4C8ECS8iQ" points="[35, -19, -383, -10]$[35, -88, -383, -79]$[163, -88, -255, -79]$[163, -22, -255, -13]$[377, -22, -41, -13]"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_LDrQoj0NEeaMp4C8ECS8iQ" type="4001" element="_LDBJXj0NEeaMp4C8ECS8iQ" source="_LDDllD0NEeaMp4C8ECS8iQ" target="_LDoNUD0NEeaMp4C8ECS8iQ">
+            <children xmi:type="notation:Node" xmi:id="_LDrQpj0NEeaMp4C8ECS8iQ" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ni66Rj0NEeaMp4C8ECS8iQ" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_LDrQqD0NEeaMp4C8ECS8iQ" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LDrQqT0NEeaMp4C8ECS8iQ" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_LDrQqj0NEeaMp4C8ECS8iQ" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LDrQqz0NEeaMp4C8ECS8iQ" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_LDrQoz0NEeaMp4C8ECS8iQ" smoothness="Normal" jumpLinkStatus="Below" jumpLinkType="Square" jumpLinksReverse="true"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_LDrQpD0NEeaMp4C8ECS8iQ" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ni66RT0NEeaMp4C8ECS8iQ" points="[-2, -19, -207, 386]$[-15, -174, -220, 231]$[186, -385, -19, 20]"/>
+          </edges>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_LDBJUz0NEeaMp4C8ECS8iQ" name="NewEClass1" tooltipText="root.NewEClass1" outgoingEdges="_LDBJWz0NEeaMp4C8ECS8iQ">
+        <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass1"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_LDBJVD0NEeaMp4C8ECS8iQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_LDBJVT0NEeaMp4C8ECS8iQ" name="NewEClass2" tooltipText="root.NewEClass2" incomingEdges="_LDBJWz0NEeaMp4C8ECS8iQ">
+        <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass2"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_LDBJVj0NEeaMp4C8ECS8iQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_LDBJVz0NEeaMp4C8ECS8iQ" name="NewEClass3" tooltipText="root.NewEClass3" outgoingEdges="_LDBJXj0NEeaMp4C8ECS8iQ">
+        <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass3"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass3"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_LDBJWD0NEeaMp4C8ECS8iQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_LDBJWT0NEeaMp4C8ECS8iQ" name="NewEClass4" tooltipText="root.NewEClass4" incomingEdges="_LDBJXj0NEeaMp4C8ECS8iQ">
+        <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass4"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass4"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_LDBJWj0NEeaMp4C8ECS8iQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_LDBJWz0NEeaMp4C8ECS8iQ" name="[0..1] newEReference1" sourceNode="_LDBJUz0NEeaMp4C8ECS8iQ" targetNode="_LDBJVT0NEeaMp4C8ECS8iQ">
+        <target xmi:type="ecore:EReference" href="My.ecore#//NewEClass1/newEReference1"/>
+        <semanticElements xmi:type="ecore:EReference" href="My.ecore#//NewEClass1/newEReference1"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_LDBJXD0NEeaMp4C8ECS8iQ" routingStyle="manhattan">
+          <customFeatures>routingStyle</customFeatures>
+          <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_LDBJXT0NEeaMp4C8ECS8iQ" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_LDBJXj0NEeaMp4C8ECS8iQ" name="[0..1] newEReference2" sourceNode="_LDBJVz0NEeaMp4C8ECS8iQ" targetNode="_LDBJWT0NEeaMp4C8ECS8iQ">
+        <target xmi:type="ecore:EReference" href="My.ecore#//NewEClass3/newEReference2"/>
+        <semanticElements xmi:type="ecore:EReference" href="My.ecore#//NewEClass3/newEReference2"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_LDBJXz0NEeaMp4C8ECS8iQ" strokeColor="252,175,62">
+          <customFeatures>strokeColor</customFeatures>
+          <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_LDBJYD0NEeaMp4C8ECS8iQ" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_LDBJYT0NEeaMp4C8ECS8iQ"/>
+      <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
+      <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
+      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+    </ownedRepresentations>
   </ownedViews>
 </viewpoint:DAnalysis>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.ecore b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.ecore
index 747ade176b..d29a646587 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.ecore
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.ecore
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="root"
-    nsPrefix="">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="root" nsPrefix="">
   <eClassifiers xsi:type="ecore:EClass" name="NewEClass1">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="newEReference1" eType="#//NewEClass2"/>
+    <eAnnotations source="refinement.link" references="#//NewEClass3"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="newEReference1" eType="#//NewEClass2">
+      <eAnnotations source="refinement.link" references="#//NewEClass3/newEReference2"/>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="NewEClass2">
+    <eAnnotations source="refinement.link" references="#//NewEClass4"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NewEClass2"/>
   <eClassifiers xsi:type="ecore:EClass" name="NewEClass3">
     <eStructuralFeatures xsi:type="ecore:EReference" name="newEReference2" eType="#//NewEClass4"/>
   </eClassifiers>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/BorderedNodeCopyPastLayoutTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/BorderedNodeCopyPasteFormatTest.java
index 2ddfdc9730..f7ce07c3c1 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/BorderedNodeCopyPastLayoutTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/BorderedNodeCopyPasteFormatTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@ package org.eclipse.sirius.tests.swtbot.layout;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.eclipse.draw2d.Shape;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
@@ -23,6 +24,7 @@ import org.eclipse.sirius.common.ui.tools.api.util.EclipseUIUtil;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
 import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramBorderNodeEditPart;
+import org.eclipse.sirius.diagram.ui.provider.Messages;
 import org.eclipse.sirius.diagram.ui.tools.internal.handler.ChangeFilterActivation;
 import org.eclipse.sirius.tests.swtbot.Activator;
 import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
@@ -30,6 +32,7 @@ import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
 import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor;
 import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
 import org.eclipse.sirius.viewpoint.DRepresentation;
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
 
@@ -38,7 +41,25 @@ import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
  * 
  * @author fbarbin
  */
-public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestCase {
+public class BorderedNodeCopyPasteFormatTest extends AbstractSiriusSwtBotGefTestCase {
+
+    /** a1 border Node location on second diagram with extension. */
+    private static final Point A1_SECOND_DIAG_GMF_LOCATION = new Point(48, -2);
+
+    /** a1 border Node GMF location on second diagram with extension. */
+    private static final Point A1_SECOND_DIAG_LOCATION = new Point(103, 28);
+
+    /** a1 border Node location on first diagram. */
+    private static final Point B1_FIRST_DIAG_GMF_LOCATION = new Point(1, -2);
+
+    /** a1 border Node GMF location on first diagram. */
+    private static final Point B1_FIRST_DIAG_LOCATION = new Point(56, 28);
+
+    /** First point used to copy format. */
+    private static final Point COPY_POINT = new Point(610, 100);
+
+    /** Second point used to paste format. */
+    private static final Point PASTE_POINT = new Point(400, 400);
 
     private static final String FILE_DIR = "/";
 
@@ -54,20 +75,26 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
 
     private static final String REPRESENTATION_NAME2 = "rep2";
 
+    private static final String REPRESENTATION_NAME3 = "rep3AdaptedForCopyPasteFormatTest";
+
+    private static final String REPRESENTATION_NAME4 = "rep4AdaptedForCopyPasteFormatTest";
+
     private static final String REPRESENTATION_DESCRIPTION_NAME = "Diagram";
 
     private static final String FILTER_NAME_INCORRECT = "The filter name is not correct";
 
-    /**
-     * Diagram on first representation.
-     */
+    /** Diagram on first representation. */
     private SWTBotSiriusDiagramEditor diagramEditor1;
 
-    /**
-     * Diagram on second representation.
-     */
+    /** Diagram on second representation. */
     private SWTBotSiriusDiagramEditor diagramEditor2;
 
+    /** Diagram on third representation with extension. */
+    private SWTBotSiriusDiagramEditor diagramEditor3;
+
+    /** Diagram on second representation with extension. */
+    private SWTBotSiriusDiagramEditor diagramEditor4;
+
     private ArrayList<Point> expectedAList, expectedBList, expectedAList_GMF, expectedBList_GMF;
 
     private ArrayList<Point> expectedCollapsedNodeList, expectedNonCollapsedNodeList, expectedCollapsedNodeList_GMF, expectedNonCollapsedNodeList_GMF;
@@ -88,8 +115,10 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         final UIResource sessionAirdResource = new UIResource(designerProject, FILE_DIR, SESSION_FILE);
         localSession = designerPerspective.openSessionFromFile(sessionAirdResource);
         // Open the 2 representations
-        diagramEditor1 = openDiagram(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME1, DDiagram.class);
-        diagramEditor2 = openDiagram(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME2, DDiagram.class);
+        diagramEditor1 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME1, DDiagram.class);
+        diagramEditor2 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME2, DDiagram.class);
+        diagramEditor3 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME3, DDiagram.class);
+        diagramEditor4 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME4, DDiagram.class);
 
         // Set expected bordered nodes locations for first container and second
         // container.
@@ -110,7 +139,7 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         expectedAList_GMF.add(5, new Point(192, -2));
 
         expectedBList = new ArrayList<Point>();
-        expectedBList.add(0, new Point(56, 28));
+        expectedBList.add(0, B1_FIRST_DIAG_LOCATION);
         expectedBList.add(1, new Point(53, 90));
         expectedBList.add(2, new Point(140, 28));
         expectedBList.add(3, new Point(140, 155));
@@ -120,7 +149,7 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         expectedBList.add(7, new Point(229, 30));
 
         expectedBList_GMF = new ArrayList<Point>();
-        expectedBList_GMF.add(0, new Point(1, -2));
+        expectedBList_GMF.add(0, B1_FIRST_DIAG_GMF_LOCATION);
         expectedBList_GMF.add(1, new Point(-2, 60));
         expectedBList_GMF.add(2, new Point(85, -2));
         expectedBList_GMF.add(3, new Point(85, 125));
@@ -171,68 +200,81 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
      * <ul>
      * <li>Check bordered node locations before copy-paste on rep1</li>
      * <li>Run copy-paste from rep1 to rep2</li>
-     * <li>Check bordered node locations after copy-paste on rep2</li>
+     * <li>Check bordered node locations after copy-paste on rep2 (also check on
+     * one style attribute that there is non style change)</li>
      * </ul>
      */
     public void testBorderedNodeCopyPasteLayout() {
         diagramEditor1.show();
         // Check LogicalFunction1 bordered nodes locations before the copy
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor1);
-
-        // Check LogicalFunction2 bordered nodes locations before the copy
-        // layout.
-        checkSecondContainerABorderedNodes(diagramEditor1);
-
-        // Check borderedNode before collapse
-        checkExtendedRBorderedNodes(diagramEditor1);
-        DRepresentation representation = getRepresentationWithName(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME1);
-
-        // collapse r1 and r2 bordered nodes by activating filter "test"
-        activateFilter((DDiagram) representation, "test");
-
-        SWTBotUtils.waitAllUiEvents();
-        // Check borderedNode after collapse
-        checkCollapsedRBorderedNodes(diagramEditor1);
-
-        // Copy LC1 layout
-        diagramEditor1.show();
-        diagramEditor1.click(new Point(100, 100));
-        diagramEditor1.clickContextMenu("Copy layout");
-
-        // Paste layout on second representation
-        diagramEditor2.show();
-        diagramEditor2.click(new Point(500, 250));
-        diagramEditor2.clickContextMenu("Paste layout");
-
-        // Copy LC2 layout
-        diagramEditor1.show();
-        diagramEditor1.click(new Point(604, 76));
-        diagramEditor1.clickContextMenu("Copy layout");
-
-        // Paste layout on second representation
-        diagramEditor2.show();
-        diagramEditor2.click(new Point(500, 250));
-        diagramEditor2.clickContextMenu("Paste layout");
-
-        // Check LogicalFunction1 bordered nodes locations after the paste
-        // layout.
-        checkFirstContainerABorderedNodes(diagramEditor2);
-
-        // Check LogicalFunction2 bordered nodes locations after the paste
-        // layout.
-        checkSecondContainerABorderedNodes(diagramEditor2);
-
-        // Check borderedNode before collapse
-        checkExtendedRBorderedNodes(diagramEditor2);
-        representation = getRepresentationWithName(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME2);
-
-        // collapse r1 and r2 bordered nodes by activating filter "test"
-        activateFilter((DDiagram) representation, "test");
-
-        SWTBotUtils.waitAllUiEvents();
-        // Check borderedNode after collapse
-        checkCollapsedRBorderedNodes(diagramEditor2);
+        checkFirstContainerABorderedNodes(diagramEditor1, expectedAList, expectedAList_GMF);
+        // Check the color before copy layout
+        Color yellow = new Color(null, 225, 225, 135);
+        Color lightBlue = new Color(null, 194, 239, 255);
+        try {
+            checkBorderNodeColor("r", diagramEditor1, yellow, "Yellow", 1);
+            checkBorderNodeColor("r", diagramEditor2, lightBlue, "Light Blue", 1);
+            // Check LogicalFunction2 bordered nodes locations before the copy
+            // layout.
+            checkSecondContainerABorderedNodes(diagramEditor1, expectedBList, expectedBList_GMF);
+
+            // Check borderedNode before collapse
+            checkExtendedRBorderedNodes(diagramEditor1);
+            DRepresentation representation = getRepresentationWithName(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME1);
+
+            // collapse r1 and r2 bordered nodes by activating filter "test"
+            activateFilter((DDiagram) representation, "test");
+
+            SWTBotUtils.waitAllUiEvents();
+            // Check borderedNode after collapse
+            checkCollapsedRBorderedNodes(diagramEditor1);
+
+            // Copy LC1 layout
+            diagramEditor1.show();
+            diagramEditor1.click(new Point(100, 100));
+            diagramEditor1.clickContextMenu(Messages.CopyFormatAction_text);
+
+            // Paste layout on second representation
+            diagramEditor2.show();
+            diagramEditor2.click(new Point(500, 250));
+            diagramEditor2.clickContextMenu(Messages.PasteLayoutAction_text);
+
+            // Copy LC2 layout
+            diagramEditor1.show();
+            diagramEditor1.click(new Point(604, 76));
+            diagramEditor1.clickContextMenu(Messages.CopyFormatAction_text);
+
+            // Paste layout on second representation
+            diagramEditor2.show();
+            diagramEditor2.click(new Point(500, 250));
+            diagramEditor2.clickContextMenu(Messages.PasteLayoutAction_text);
+
+            // Check LogicalFunction1 bordered nodes locations after the paste
+            // layout.
+            checkFirstContainerABorderedNodes(diagramEditor2, expectedAList, expectedAList_GMF);
+
+            // Check LogicalFunction2 bordered nodes locations after the paste
+            // layout.
+            checkSecondContainerABorderedNodes(diagramEditor2, expectedBList, expectedBList_GMF);
+
+            // Check the color after paste layout (no change expected)
+            checkBorderNodeColor("r", diagramEditor2, lightBlue, "Light Blue", 1);
+
+            // Check borderedNode before collapse
+            checkExtendedRBorderedNodes(diagramEditor2);
+            representation = getRepresentationWithName(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME2);
+
+            // collapse r1 and r2 bordered nodes by activating filter "test"
+            activateFilter((DDiagram) representation, "test");
+
+            SWTBotUtils.waitAllUiEvents();
+            // Check borderedNode after collapse
+            checkCollapsedRBorderedNodes(diagramEditor2);
+        } finally {
+            yellow.dispose();
+            lightBlue.dispose();
+        }
     }
 
     /**
@@ -248,11 +290,11 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         diagramEditor1.show();
         // Check LogicalFunction1 bordered nodes locations before the copy
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor1);
+        checkFirstContainerABorderedNodes(diagramEditor1, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations before the copy
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor1);
+        checkSecondContainerABorderedNodes(diagramEditor1, expectedBList, expectedBList_GMF);
 
         // Check borderedNode before collapse
         checkExtendedRBorderedNodes(diagramEditor1);
@@ -268,20 +310,20 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         // Copy LC1 layout
         diagramEditor1.show();
         diagramEditor1.click(new Point(1, 1));
-        diagramEditor1.clickContextMenu("Copy layout");
+        diagramEditor1.clickContextMenu(Messages.CopyFormatAction_text);
 
         // Paste layout on second representation
         diagramEditor2.show();
         diagramEditor2.click(new Point(100, 400));
-        diagramEditor2.clickContextMenu("Paste layout");
+        diagramEditor2.clickContextMenu(Messages.PasteLayoutAction_text);
 
         // Check LogicalFunction1 bordered nodes locations after the paste
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor2);
+        checkFirstContainerABorderedNodes(diagramEditor2, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations after the paste
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor2);
+        checkSecondContainerABorderedNodes(diagramEditor2, expectedBList, expectedBList_GMF);
 
         // Check borderedNode before collapse
         checkExtendedRBorderedNodes(diagramEditor2);
@@ -309,11 +351,11 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         diagramEditor1.show();
         // Check LogicalFunction1 bordered nodes locations before the copy
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor1);
+        checkFirstContainerABorderedNodes(diagramEditor1, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations before the copy
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor1);
+        checkSecondContainerABorderedNodes(diagramEditor1, expectedBList, expectedBList_GMF);
 
         // Check borderedNode before collapse
         checkExtendedRBorderedNodes(diagramEditor1);
@@ -332,20 +374,20 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
 
         diagramEditor1.bot().toolbarDropDownButtonWithTooltip("Select &All").click();
 
-        diagramEditor1.clickContextMenu("Copy layout");
+        diagramEditor1.clickContextMenu(Messages.CopyFormatAction_text);
 
         // Paste layout on second representation
         diagramEditor2.show();
         diagramEditor2.click(new Point(100, 400));
-        diagramEditor2.clickContextMenu("Paste layout");
+        diagramEditor2.clickContextMenu(Messages.PasteLayoutAction_text);
 
         // Check LogicalFunction1 bordered nodes locations after the paste
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor2);
+        checkFirstContainerABorderedNodes(diagramEditor2, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations after the paste
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor2);
+        checkSecondContainerABorderedNodes(diagramEditor2, expectedBList, expectedBList_GMF);
 
         // Check borderedNode before collapse
         checkExtendedRBorderedNodes(diagramEditor2);
@@ -376,11 +418,11 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         diagramEditor1.show();
         // Check LogicalFunction1 bordered nodes locations before the copy
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor1);
+        checkFirstContainerABorderedNodes(diagramEditor1, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations before the copy
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor1);
+        checkSecondContainerABorderedNodes(diagramEditor1, expectedBList, expectedBList_GMF);
 
         // Check borderedNode before collapse
         checkExtendedRBorderedNodes(diagramEditor1);
@@ -390,7 +432,7 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
 
         diagramEditor1.bot().toolbarDropDownButtonWithTooltip("Select &All").click();
 
-        diagramEditor1.clickContextMenu("Copy layout");
+        diagramEditor1.clickContextMenu(Messages.CopyFormatAction_text);
 
         // activate hide filter on representation 2
 
@@ -400,6 +442,7 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         SWTBotUtils.waitAllUiEvents();
         // hide b bordered nodes by activating filter "testHide"
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 activateFilter((DDiagram) representation2, "testHide");
             }
@@ -409,10 +452,11 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
 
         // Paste layout on second representation
         diagramEditor2.click(new Point(100, 400));
-        diagramEditor2.clickContextMenu("Paste layout");
+        diagramEditor2.clickContextMenu(Messages.PasteLayoutAction_text);
 
         // reveal b bordered nodes by deactivating filter "testHide"
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 deactivateFilter((DDiagram) representation2, "testHide");
             }
@@ -421,11 +465,11 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
 
         // Check LogicalFunction1 bordered nodes locations after the paste
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor2);
+        checkFirstContainerABorderedNodes(diagramEditor2, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations after the paste
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor2);
+        checkSecondContainerABorderedNodes(diagramEditor2, expectedBList, expectedBList_GMF);
 
         checkExtendedRBorderedNodes(diagramEditor2);
 
@@ -447,11 +491,11 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         diagramEditor1.show();
         // Check LogicalFunction1 bordered nodes locations before the copy
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor1);
+        checkFirstContainerABorderedNodes(diagramEditor1, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations before the copy
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor1);
+        checkSecondContainerABorderedNodes(diagramEditor1, expectedBList, expectedBList_GMF);
 
         // Check borderedNode before collapse
         checkExtendedRBorderedNodes(diagramEditor1);
@@ -461,7 +505,7 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
 
         diagramEditor1.bot().toolbarDropDownButtonWithTooltip("Select &All").click();
 
-        diagramEditor1.clickContextMenu("Copy layout");
+        diagramEditor1.clickContextMenu(Messages.CopyFormatAction_text);
 
         final DRepresentation representation2 = getRepresentationWithName(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME2);
 
@@ -476,7 +520,7 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
 
         // Paste layout on second representation
         diagramEditor2.click(new Point(100, 400));
-        diagramEditor2.clickContextMenu("Paste layout");
+        diagramEditor2.clickContextMenu(Messages.PasteLayoutAction_text);
 
         // extend bordered nodes by deactivating filter "testHide"
         deactivateFilter((DDiagram) representation2, "testCollapseAtt");
@@ -485,11 +529,11 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
 
         // Check LogicalFunction1 bordered nodes locations after the paste
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor2);
+        checkFirstContainerABorderedNodes(diagramEditor2, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations after the paste
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor2);
+        checkSecondContainerABorderedNodes(diagramEditor2, expectedBList, expectedBList_GMF);
 
         checkExtendedRBorderedNodes(diagramEditor2);
 
@@ -511,11 +555,11 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         diagramEditor1.show();
         // Check LogicalFunction1 bordered nodes locations before the copy
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor1);
+        checkFirstContainerABorderedNodes(diagramEditor1, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations before the copy
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor1);
+        checkSecondContainerABorderedNodes(diagramEditor1, expectedBList, expectedBList_GMF);
 
         // Check borderedNode before collapse
         checkExtendedRBorderedNodes(diagramEditor1);
@@ -530,24 +574,24 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
 
         diagramEditor1.bot().toolbarDropDownButtonWithTooltip("Select &All").click();
 
-        diagramEditor1.clickContextMenu("Copy layout");
+        diagramEditor1.clickContextMenu(Messages.CopyFormatAction_text);
 
         diagramEditor2.show();
         SWTBotUtils.waitAllUiEvents();
 
         // Paste layout on second representation
         diagramEditor2.click(new Point(100, 400));
-        diagramEditor2.clickContextMenu("Paste layout");
+        diagramEditor2.clickContextMenu(Messages.PasteLayoutAction_text);
 
         SWTBotUtils.waitAllUiEvents();
 
         // Check LogicalFunction1 bordered nodes locations after the paste
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor2);
+        checkFirstContainerABorderedNodes(diagramEditor2, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations after the paste
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor2);
+        checkSecondContainerABorderedNodes(diagramEditor2, expectedBList, expectedBList_GMF);
 
         checkExtendedRBorderedNodes(diagramEditor2);
 
@@ -571,11 +615,11 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         diagramEditor1.show();
         // Check LogicalFunction1 bordered nodes locations before the copy
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor1);
+        checkFirstContainerABorderedNodes(diagramEditor1, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations before the copy
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor1);
+        checkSecondContainerABorderedNodes(diagramEditor1, expectedBList, expectedBList_GMF);
 
         // Check borderedNode before collapse
         checkExtendedRBorderedNodes(diagramEditor1);
@@ -590,7 +634,7 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
 
         diagramEditor1.bot().toolbarDropDownButtonWithTooltip("Select &All").click();
 
-        diagramEditor1.clickContextMenu("Copy layout");
+        diagramEditor1.clickContextMenu(Messages.CopyFormatAction_text);
 
         diagramEditor2.show();
 
@@ -606,7 +650,7 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
 
         // Paste layout on second representation
         diagramEditor2.click(new Point(100, 400));
-        diagramEditor2.clickContextMenu("Paste layout");
+        diagramEditor2.clickContextMenu(Messages.PasteLayoutAction_text);
 
         SWTBotUtils.waitAllUiEvents();
         // extend bordered nodes by deactivating filter "testHide"
@@ -616,11 +660,11 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
 
         // Check LogicalFunction1 bordered nodes locations after the paste
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor2);
+        checkFirstContainerABorderedNodes(diagramEditor2, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations after the paste
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor2);
+        checkSecondContainerABorderedNodes(diagramEditor2, expectedBList, expectedBList_GMF);
 
         checkExtendedRBorderedNodes(diagramEditor2);
 
@@ -639,11 +683,11 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         diagramEditor1.show();
         // Check LogicalFunction1 bordered nodes locations before the copy
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor1);
+        checkFirstContainerABorderedNodes(diagramEditor1, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations before the copy
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor1);
+        checkSecondContainerABorderedNodes(diagramEditor1, expectedBList, expectedBList_GMF);
 
         // Check borderedNode before collapse
         checkExtendedRBorderedNodes(diagramEditor1);
@@ -659,56 +703,62 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
         // Copy LC1 layout
         diagramEditor1.show();
         diagramEditor1.click(new Point(1, 1));
-        diagramEditor1.clickContextMenu("Copy layout");
+        diagramEditor1.clickContextMenu(Messages.CopyFormatAction_text);
 
         // Paste layout on same representation
         diagramEditor1.click(new Point(1, 1));
-        diagramEditor1.clickContextMenu("Paste layout");
+        diagramEditor1.clickContextMenu(Messages.PasteLayoutAction_text);
 
         // Check LogicalFunction1 bordered nodes locations after the paste
         // layout.
-        checkFirstContainerABorderedNodes(diagramEditor1);
+        checkFirstContainerABorderedNodes(diagramEditor1, expectedAList, expectedAList_GMF);
 
         // Check LogicalFunction2 bordered nodes locations after the paste
         // layout.
-        checkSecondContainerABorderedNodes(diagramEditor1);
+        checkSecondContainerABorderedNodes(diagramEditor1, expectedBList, expectedBList_GMF);
 
         // Check borderedNode after collapse
         checkCollapsedRBorderedNodes(diagramEditor1);
     }
 
-    private void checkSecondContainerABorderedNodes(SWTBotSiriusDiagramEditor editorToCheck) {
+    private void checkSecondContainerABorderedNodes(SWTBotSiriusDiagramEditor editorToCheck, ArrayList<Point> expectedList, ArrayList<Point> expectedList_GMF) {
         for (int i = 1; i <= 8; i++) {
-            SWTBotGefEditPart editPart = editorToCheck.getEditPart("b" + i, AbstractDiagramBorderNodeEditPart.class);
-            if (editPart != null) {
-                AbstractDiagramBorderNodeEditPart part = (AbstractDiagramBorderNodeEditPart) editPart.part();
-                // Check draw2d location
-                Point location = part.getFigure().getBounds().getTopLeft();
-                assertEquals("Wrong expected location for bordered node b" + i, expectedBList.get(i - 1), location);
-                // Check GMF location
-                Point locationGMF = new Point(((Location) ((Node) part.getModel()).getLayoutConstraint()).getX(), ((Location) ((Node) part.getModel()).getLayoutConstraint()).getY());
-                assertEquals("Wrong expected GMF location for bordered node b" + i, expectedBList_GMF.get(i - 1), locationGMF);
-            }
+            checkBorderNode("b", editorToCheck, expectedList.get(i - 1), expectedList_GMF.get(i - 1), i);
+        }
+    }
+
+    private void checkBorderNode(String label, SWTBotSiriusDiagramEditor editorToCheck, Point expectedPoint, Point expectedPoint_GMF, int i) {
+        SWTBotGefEditPart editPart = editorToCheck.getEditPart(label + i, AbstractDiagramBorderNodeEditPart.class);
+        if (editPart != null) {
+            AbstractDiagramBorderNodeEditPart part = (AbstractDiagramBorderNodeEditPart) editPart.part();
+            // Check draw2d location
+            Point location = part.getFigure().getBounds().getTopLeft();
+            assertEquals("Wrong expected location for bordered node " + label + i, expectedPoint, location);
+            // Check GMF location
+            Point locationGMF = new Point(((Location) ((Node) part.getModel()).getLayoutConstraint()).getX(), ((Location) ((Node) part.getModel()).getLayoutConstraint()).getY());
+            assertEquals("Wrong expected GMF location for bordered node " + label + i, expectedPoint_GMF, locationGMF);
+        }
+    }
+
+    private void checkBorderNodeColor(String label, SWTBotSiriusDiagramEditor editorToCheck, Color color, String nameColor, int i) {
+        SWTBotGefEditPart editPart = editorToCheck.getEditPart(label + i, AbstractDiagramBorderNodeEditPart.class);
+        if (editPart != null) {
+            AbstractDiagramBorderNodeEditPart part = (AbstractDiagramBorderNodeEditPart) editPart.part();
+            // Check color
+            Object shape = part.getStyleEditPart().getFigure().getChildren().get(0);
+            assertEquals("The color of figure for " + label + i + " must be " + nameColor, color, ((Shape) shape).getBackgroundColor());
         }
     }
 
-    private void checkFirstContainerABorderedNodes(SWTBotSiriusDiagramEditor editorToCheck) {
+    private void checkFirstContainerABorderedNodes(SWTBotSiriusDiagramEditor editorToCheck, ArrayList<Point> expectedList, ArrayList<Point> expectedList_GMF) {
         for (int i = 1; i <= 6; i++) {
-            SWTBotGefEditPart editPart = editorToCheck.getEditPart("a" + i, AbstractDiagramBorderNodeEditPart.class);
-            if (editPart != null) {
-                AbstractDiagramBorderNodeEditPart part = (AbstractDiagramBorderNodeEditPart) editPart.part();
-                // Check draw2d location
-                Point location = part.getFigure().getBounds().getTopLeft();
-                assertEquals("Wrong expected location for bordered node a" + i, expectedAList.get(i - 1), location);
-                // Check GMF location
-                Point locationGMF = new Point(((Location) ((Node) part.getModel()).getLayoutConstraint()).getX(), ((Location) ((Node) part.getModel()).getLayoutConstraint()).getY());
-                assertEquals("Wrong expected GMF location for bordered node a" + i, expectedAList_GMF.get(i - 1), locationGMF);
-            }
+            checkBorderNode("a", editorToCheck, expectedList.get(i - 1), expectedList_GMF.get(i - 1), i);
         }
     }
 
     private void checkCollapsedRBorderedNodes(SWTBotSiriusDiagramEditor editorToCheck) {
         for (int i = 1; i <= 2; i++) {
+
             SWTBotGefEditPart editPart = editorToCheck.getEditPart("r" + i, AbstractDiagramBorderNodeEditPart.class);
             if (editPart != null) {
                 AbstractDiagramBorderNodeEditPart part = (AbstractDiagramBorderNodeEditPart) editPart.part();
@@ -748,6 +798,81 @@ public class BorderedNodeCopyPastLayoutTest extends AbstractSiriusSwtBotGefTestC
     }
 
     /**
+     * Test that the paste layout puts the elements at the expected location.
+     * This test uses the copy-paste layout on Diagram using the
+     * org.eclipse.sirius.diagram.ui.layoutDataManager extension-point (the
+     * sampleNameDataProvider contributed in oes.tests.junit plug-in).
+     * <ul>
+     * <li>Check container locations before copy-paste on rep3</li>
+     * <li>Run copy-paste from rep3 to rep4</li>
+     * <li>Check border node location after copy-paste on rep4</li>
+     * </ul>
+     */
+    public void testBorderedNodeCopyPasteLayoutOnDiagramWithExtension() {
+        diagramEditor3.show();
+        // Check LogicalFunction1 bordered nodes locations before the copy
+        // layout.
+        checkFirstContainerABorderedNodes(diagramEditor3, expectedAList, expectedAList_GMF);
+
+        // Check LogicalFunction2 bordered nodes locations before the copy
+        // layout.
+        checkSecondContainerABorderedNodes(diagramEditor3, expectedBList, expectedBList_GMF);
+
+        // Copy LC1 layout
+        diagramEditor3.click(COPY_POINT);
+        diagramEditor3.clickContextMenu(Messages.CopyFormatAction_text);
+
+        diagramEditor4.show();
+        // Paste layout on second representation
+        diagramEditor4.click(PASTE_POINT);
+        diagramEditor4.clickContextMenu(Messages.PasteLayoutAction_text);
+
+        // Check LogicalFunction1 bordered nodes locations after the paste
+        // layout.
+        checkBorderNode("a", diagramEditor4, B1_FIRST_DIAG_LOCATION, B1_FIRST_DIAG_GMF_LOCATION, 1);
+    }
+
+    /**
+     * Test that the paste style changes style on the expected figure. This test
+     * uses the copy-paste style on Diagram using the
+     * org.eclipse.sirius.diagram.ui.layoutDataManager extension-point (the
+     * sampleNameDataProvider contributed in oes.tests.junit plug-in). Style of
+     * border node a1 from a first diagram is applied on border node LC2 from a
+     * second diagram.
+     * <ul>
+     * <li>Run copy-paste Style from rep7 to rep5</li>
+     * <li>Check node locations and style after copy-paste on rep5. Check style
+     * node changes into yellow.</li>
+     * </ul>
+     */
+    public void testBorderNodeCopyPasteStyleOnDiagramWithExtension() {
+        diagramEditor3.show();
+        // Copy LC1 layout
+        diagramEditor3.click(COPY_POINT);
+        diagramEditor3.clickContextMenu(Messages.CopyFormatAction_text);
+
+        diagramEditor4.show();
+        // Check a1 bordered nodes locations before the paste style.
+        checkBorderNode("a", diagramEditor4, A1_SECOND_DIAG_LOCATION, A1_SECOND_DIAG_GMF_LOCATION, 1);
+
+        // Paste style on second representation
+        diagramEditor4.click(PASTE_POINT);
+        diagramEditor4.clickContextMenu(Messages.PasteStyleAction_text);
+
+        // Check a1 bordered nodes locations does not change after the paste
+        // layout.
+        checkBorderNode("a", diagramEditor4, A1_SECOND_DIAG_LOCATION, A1_SECOND_DIAG_GMF_LOCATION, 1);
+
+        // Check border node color
+        Color yellow = new Color(null, 252, 233, 79);
+        try {
+            checkBorderNodeColor("a", diagramEditor4, yellow, "Yellow", 1);
+        } finally {
+            yellow.dispose();
+        }
+    }
+
+    /**
      * Activate a filter.
      * 
      * @param diagram
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/ContainerAndNodeCopyPasteFormatTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/ContainerAndNodeCopyPasteFormatTest.java
new file mode 100644
index 0000000000..7a5a15b019
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/ContainerAndNodeCopyPasteFormatTest.java
@@ -0,0 +1,779 @@
+/*******************************************************************************
+ * Copyright (c) 2016 THALES GLOBAL SERVICES.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.tests.swtbot.layout;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Shape;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart;
+import org.eclipse.gmf.runtime.notation.LayoutConstraint;
+import org.eclipse.gmf.runtime.notation.Location;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.Size;
+import org.eclipse.sirius.diagram.DDiagram;
+import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramElementContainerEditPart;
+import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramNodeEditPart;
+import org.eclipse.sirius.diagram.ui.internal.edit.parts.SquareEditPart.SquareFigure;
+import org.eclipse.sirius.diagram.ui.provider.Messages;
+import org.eclipse.sirius.diagram.ui.tools.api.figure.LozengeFigure;
+import org.eclipse.sirius.diagram.ui.tools.api.figure.ODesignEllipseFigure;
+import org.eclipse.sirius.diagram.ui.tools.api.figure.SVGWorkspaceImageFigure;
+import org.eclipse.sirius.ext.base.Option;
+import org.eclipse.sirius.ext.base.Options;
+import org.eclipse.sirius.tests.swtbot.Activator;
+import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
+import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
+import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor;
+import org.eclipse.sirius.tests.unit.diagram.layout.data.manager.extension.SampleNameDataProvider;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
+
+/**
+ * Test container and node Copy-Paste layout and style from and to diagram with
+ * extension.
+ * 
+ * @author jmallet
+ */
+public class ContainerAndNodeCopyPasteFormatTest extends AbstractSiriusSwtBotGefTestCase {
+
+    /** Label of LC2 representation on diagram. */
+    private static final String LC2_LABEL = "LC2";
+
+    /** Label of LC1 representation on diagram. */
+    private static final String LC1_LABEL = "LC1";
+
+    /**
+     * Point used to paste Layout. This point does not reference any edit part.
+     */
+    private static final Point EMPTY_POINT = new Point(50, 500);
+
+    /** Point used to select LC2 container. */
+    private static final Point LC2_POINT = new Point(870, 100);
+
+    /** LC2 Container bounds for diagram4. */
+    private static final Rectangle LC2_CONTAINER_BOUNDS_DIAG4 = new Rectangle(600, 72, 291, 243);
+
+    /** LC1 Container bounds for diagram4. */
+    private static final Rectangle LC1_CONTAINER_BOUNDS_DIAG4 = new Rectangle(96, 96, 363, 255);
+
+    /** LC2 Container bounds for diagram3. */
+    private static final Rectangle LC2_CONTAINER_BOUNDS_DIAG3 = new Rectangle(600, 72, 291, 243);
+
+    /** LC1 Container bounds for diagram3. */
+    private static final Rectangle LC1_CONTAINER_BOUNDS_DIAG3 = new Rectangle(96, 96, 363, 255);
+
+    /**
+     * LC2 node Bounds for diagram using specific style to represent this node.
+     */
+    private static final Rectangle NEW_STYLE_LC2_NODE_BOUNDS = new Rectangle(830, 25, 400, 400);
+
+    /** Initial bounds for LC1 square node. */
+    private static final Rectangle INITIAL_LC1_SQUARE_NODE_BOUNDS = new Rectangle(0, 0, 30, 30);
+
+    /** Initial bounds for LC2 square node. */
+    private static final Rectangle INITIAL_LC2_SQUARE_NODE_BOUNDS = new Rectangle(90, 0, 30, 30);
+
+    private static final String FILE_DIR = "/";
+
+    private static final String VSM = "VP-3601.odesign";
+
+    private static final String MODEL = "VP-3601.ecore";
+
+    private static final String SESSION_FILE = "VP-3601.aird";
+
+    private static final String THUX_IMAGE = "Tux.svg";
+
+    private static final String DATA_UNIT_DIR = "data/unit/layout/borderedNodesCopyPastLayout/";
+
+    private static final String REPRESENTATION_NAME3 = "rep3AdaptedForCopyPasteFormatTest";
+
+    private static final String REPRESENTATION_NAME4 = "rep4AdaptedForCopyPasteFormatTest";
+
+    private static final String REPRESENTATION_NAME_WITH_SQUARE = "repSquareAdaptedForCopyPasteFormatTest";
+
+    private static final String REPRESENTATION_NAME_WITH_ELLIPSE = "repEllipseAdaptedForCopyPasteFormatTest";
+
+    private static final String REPRESENTATION_NAME_WITH_DIAMOND = "repDiamondAdaptedForCopyPasteFormatTest";
+
+    private static final String REPRESENTATION_NAME_WITH_IMAGE = "repImageAdaptedForCopyPasteFormatTest";
+
+    private static final String REPRESENTATION_DESCRIPTION_NAME = "Diagram";
+
+    private static final String REPRESENTATION_DESCRIPTION_NAME_SQUARE_LCNODE = "DiagramWithSquareLCNode";
+
+    private static final String REPRESENTATION_DESCRIPTION_NAME_ELLIPSE_LCNODE = "DiagramWithYellowEllipseLCNode";
+
+    private static final String REPRESENTATION_DESCRIPTION_NAME_DIAMOND_LCNODE = "DiagramWithOrangeDiamondLCNode";
+
+    private static final String REPRESENTATION_DESCRIPTION_NAME_IMAGE_LCNODE = "DiagramWithImageLCNode";
+
+    /**
+     * Diagram on third representation using a specific copy/paste extension (
+     * {@link SampleNameDataProvider}).
+     */
+    private SWTBotSiriusDiagramEditor diagramEditor3;
+
+    /**
+     * Diagram on second representation using a specific copy/paste extension (
+     * {@link SampleNameDataProvider}).
+     */
+    private SWTBotSiriusDiagramEditor diagramEditor4;
+
+    /**
+     * Diagram on fifth representation using a specific copy/paste extension (
+     * {@link SampleNameDataProvider}), package are represented by gray square.
+     */
+    private SWTBotSiriusDiagramEditor diagramEditor5;
+
+    /**
+     * Diagram on fifth representation using a specific copy/paste extension (
+     * {@link SampleNameDataProvider}), package are represented by orange
+     * diamond.
+     */
+    private SWTBotSiriusDiagramEditor diagramEditor6;
+
+    /**
+     * Diagram on fifth representation using a specific copy/paste extension (
+     * {@link SampleNameDataProvider}), package are represented by yellow
+     * ellipse.
+     */
+    private SWTBotSiriusDiagramEditor diagramEditor7;
+
+    /**
+     * Diagram on fifth representation using a specific copy/paste extension (
+     * {@link SampleNameDataProvider}), package are represented by workspace
+     * image.
+     */
+    private SWTBotSiriusDiagramEditor diagramEditor8;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void onSetUpBeforeClosingWelcomePage() throws Exception {
+        copyFileToTestProject(Activator.PLUGIN_ID, DATA_UNIT_DIR, MODEL, SESSION_FILE, VSM, THUX_IMAGE);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void onSetUpAfterOpeningDesignerPerspective() throws Exception {
+        final UIResource sessionAirdResource = new UIResource(designerProject, FILE_DIR, SESSION_FILE);
+        localSession = designerPerspective.openSessionFromFile(sessionAirdResource);
+        // Open the 6 representations
+        diagramEditor3 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME3, DDiagram.class);
+        diagramEditor4 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME4, DDiagram.class);
+        diagramEditor5 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME_SQUARE_LCNODE, REPRESENTATION_NAME_WITH_SQUARE,
+                DDiagram.class);
+        diagramEditor6 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME_ELLIPSE_LCNODE, REPRESENTATION_NAME_WITH_ELLIPSE,
+                DDiagram.class);
+        diagramEditor7 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME_DIAMOND_LCNODE, REPRESENTATION_NAME_WITH_DIAMOND,
+                DDiagram.class);
+        diagramEditor8 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME_IMAGE_LCNODE, REPRESENTATION_NAME_WITH_IMAGE, DDiagram.class);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void tearDown() throws Exception {
+        diagramEditor3 = null;
+        diagramEditor4 = null;
+        diagramEditor5 = null;
+        diagramEditor6 = null;
+        diagramEditor7 = null;
+        diagramEditor8 = null;
+        super.tearDown();
+    }
+
+    /**
+     * Test that the paste layout puts the elements at the expected location.
+     * This test uses the copy-paste layout on Diagram using the
+     * org.eclipse.sirius.diagram.ui.layoutDataManager extension-point (the
+     * sampleNameDataProvider contributed in oes.tests.junit plug-in).
+     * <ul>
+     * <li>Check container locations before copy-paste on rep3</li>
+     * <li>Run copy-paste from rep3 to rep4</li>
+     * <li>Check container locations after copy-paste on rep4</li>
+     * </ul>
+     */
+    public void testContainerCopyPasteLayoutOnDiagramWithExtension() {
+        diagramEditor3.show();
+        // Check LogicalFunction1 container locations before the copy layout.
+        checkContainerBounds(diagramEditor3, LC1_LABEL, LC1_CONTAINER_BOUNDS_DIAG3, LC1_CONTAINER_BOUNDS_DIAG3);
+
+        // Check LogicalFunction2 container locations before the copy layout.
+        checkContainerBounds(diagramEditor3, LC2_LABEL, LC2_CONTAINER_BOUNDS_DIAG3, LC2_CONTAINER_BOUNDS_DIAG3);
+
+        Option<Color> originalCopiedColor = getBackgroundColor(diagramEditor3, LC2_LABEL);
+
+        // Copy LC1 layout
+        diagramEditor3.click(LC2_POINT);
+        diagramEditor3.clickContextMenu(Messages.CopyFormatAction_text);
+
+        diagramEditor4.show();
+
+        // Check LogicalFunction1 container locations before the paste layout.
+        checkContainerBounds(diagramEditor4, LC1_LABEL, LC1_CONTAINER_BOUNDS_DIAG4, LC1_CONTAINER_BOUNDS_DIAG4);
+
+        // Check LogicalFunction2 container locations before the paste layout.
+        checkContainerBounds(diagramEditor4, LC2_LABEL, LC2_CONTAINER_BOUNDS_DIAG4, LC2_CONTAINER_BOUNDS_DIAG4);
+
+        // Paste layout on second representation
+        diagramEditor4.click(EMPTY_POINT);
+        diagramEditor4.clickContextMenu(Messages.PasteLayoutAction_text);
+
+        // Check LogicalFunction1 container locations after the paste layout.
+        checkContainerBounds(diagramEditor4, LC1_LABEL, LC2_CONTAINER_BOUNDS_DIAG3, LC2_CONTAINER_BOUNDS_DIAG3);
+
+        // Check that style has not changed (current color is not the copied
+        // color)
+        Option<Color> currentColor = getBackgroundColor(diagramEditor4, LC1_LABEL);
+        if (originalCopiedColor.some() && currentColor.some()) {
+            assertFalse("The style must not be changed with a Copy Layout", originalCopiedColor.get().equals(currentColor.get()));
+        }
+    }
+
+    private Option<Color> getBackgroundColor(SWTBotSiriusDiagramEditor editorToCheck, String label) {
+        SWTBotGefEditPart editPart = editorToCheck.getEditPart(label, AbstractDiagramElementContainerEditPart.class);
+        if (editPart != null) {
+            AbstractDiagramElementContainerEditPart part = (AbstractDiagramElementContainerEditPart) editPart.part();
+            return Options.newSome(part.getFigure().getBackgroundColor());
+        }
+        return Options.newNone();
+    }
+
+    /**
+     * Test that the paste layout puts the elements at the expected location.
+     * This test uses the copy-paste layout on Diagram using the
+     * org.eclipse.sirius.diagram.ui.layoutDataManager extension-point (the
+     * sampleNameDataProvider contributed in oes.tests.junit plug-in) Layout of
+     * container LC2 from a first diagram is applied on node LC1 from a second
+     * diagram.
+     * <ul>
+     * <li>Check container locations before copy-paste on rep3</li>
+     * <li>Run copy-paste from rep3 to rep5</li>
+     * <li>Check container locations after copy-paste on rep5. Check node
+     * becomes container.</li>
+     * </ul>
+     */
+    public void testContainerToNodeCopyPasteLayoutOnDiagramWithExtension() {
+        diagramEditor3.show();
+        // Check LogicalFunction1 container locations before the copy layout.
+        checkContainerBounds(diagramEditor3, LC1_LABEL, LC1_CONTAINER_BOUNDS_DIAG3, LC1_CONTAINER_BOUNDS_DIAG3);
+
+        // Check LogicalFunction2 container locations before the copy layout.
+        Rectangle LC2Bounds = checkContainerBounds(diagramEditor3, LC2_LABEL, LC2_CONTAINER_BOUNDS_DIAG3, LC2_CONTAINER_BOUNDS_DIAG3);
+
+        // Copy LC1 layout
+        diagramEditor3.click(LC2_POINT);
+        diagramEditor3.clickContextMenu(Messages.CopyFormatAction_text);
+
+        diagramEditor5.show();
+
+        // Check LogicalFunction1 node locations before the paste layout.
+        checkNodeBounds(diagramEditor5, LC1_LABEL, INITIAL_LC1_SQUARE_NODE_BOUNDS, INITIAL_LC1_SQUARE_NODE_BOUNDS);
+
+        // Check LogicalFunction2 node locations before the paste layout.
+        checkNodeBounds(diagramEditor5, LC2_LABEL, INITIAL_LC2_SQUARE_NODE_BOUNDS, INITIAL_LC2_SQUARE_NODE_BOUNDS);
+
+        // Paste layout on second representation
+        diagramEditor5.click(EMPTY_POINT);
+        diagramEditor5.clickContextMenu(Messages.PasteLayoutAction_text);
+
+        // Check LogicalFunction1 node locations after the paste layout.
+        checkNodeBounds(diagramEditor5, LC1_LABEL, LC2Bounds, LC2Bounds);
+    }
+
+    /**
+     * Test that the paste style changes style on the expected figure. This test
+     * uses the copy-paste style on Diagram using the
+     * org.eclipse.sirius.diagram.ui.layoutDataManager extension-point (the
+     * sampleNameDataProvider contributed in oes.tests.junit plug-in). Style of
+     * node LC2 from a first diagram is applied on node LC1 from a second
+     * diagram.
+     * <ul>
+     * <li>Check node location and style before paste on rep5</li>
+     * <li>Run copy-paste Style from rep6 to rep5</li>
+     * <li>Check node locations and style after copy-paste on rep5. Check style
+     * node changes into yellow ellipse.</li>
+     * </ul>
+     */
+    public void testNodeToNodeCopyPasteEllipseStyleOnDiagramWithExtension() {
+        diagramEditor6.show();
+        // Copy LC1 style
+        diagramEditor6.click(LC2_POINT);
+        diagramEditor6.clickContextMenu(Messages.CopyFormatAction_text);
+        diagramEditor5.show();
+
+        // Check LogicalFunction1 node locations before the paste style.
+        Rectangle LC1Bounds = checkNodeBounds(diagramEditor5, LC1_LABEL, INITIAL_LC1_SQUARE_NODE_BOUNDS, INITIAL_LC1_SQUARE_NODE_BOUNDS);
+
+        // Check LogicalFunction2 node locations before the paste style.
+        checkNodeBounds(diagramEditor5, LC2_LABEL, INITIAL_LC2_SQUARE_NODE_BOUNDS, INITIAL_LC2_SQUARE_NODE_BOUNDS);
+
+        // check LogicalFunction1 node style before the paste style.
+        checkGraySquareStyle(diagramEditor5, LC1_LABEL);
+
+        // Paste style on second representation
+        diagramEditor5.click(EMPTY_POINT);
+        diagramEditor5.clickContextMenu(Messages.PasteStyleAction_text);
+
+        // Check LogicalFunction1 node locations does not changed after the
+        // paste layout.
+        checkNodeBounds(diagramEditor5, LC1_LABEL, LC1Bounds, LC1Bounds);
+
+        // Check style
+        checkYellowEllipseStyle(diagramEditor5, LC1_LABEL);
+    }
+
+    /**
+     * Test that the paste style changes style on the expected figure. This test
+     * uses the copy-paste style on Diagram using the
+     * org.eclipse.sirius.diagram.ui.layoutDataManager extension-point (the
+     * sampleNameDataProvider contributed in oes.tests.junit plug-in). Style of
+     * node LC2 from a first diagram is applied on node LC1 from a second
+     * diagram.
+     * <ul>
+     * <li>Check node location and style before paste on rep5</li>
+     * <li>Run copy-paste Style from rep7 to rep5</li>
+     * <li>Check node locations and style after copy-paste on rep5. Check style
+     * node changes into orange diamond.</li>
+     * </ul>
+     */
+    public void testNodeToNodeCopyPasteDiamondStyleOnDiagramWithExtension() {
+        diagramEditor7.show();
+        // Copy LC1 layout
+        diagramEditor7.click(LC2_POINT);
+        diagramEditor7.clickContextMenu(Messages.CopyFormatAction_text);
+
+        diagramEditor5.show();
+
+        // Check LogicalFunction1 node locations before the paste style.
+        Rectangle LC1Bounds = checkNodeBounds(diagramEditor5, LC1_LABEL, INITIAL_LC1_SQUARE_NODE_BOUNDS, INITIAL_LC1_SQUARE_NODE_BOUNDS);
+
+        // Check LogicalFunction2 node locations before the paste style.
+        checkNodeBounds(diagramEditor5, LC2_LABEL, INITIAL_LC2_SQUARE_NODE_BOUNDS, INITIAL_LC2_SQUARE_NODE_BOUNDS);
+
+        // check LogicalFunction1 node style before the paste style.
+        checkGraySquareStyle(diagramEditor5, LC1_LABEL);
+
+        // Paste layout on second representation
+        diagramEditor5.click(EMPTY_POINT);
+        diagramEditor5.clickContextMenu(Messages.PasteStyleAction_text);
+
+        // Check LogicalFunction1 node locations does not change after the paste
+        // style.
+        checkNodeBounds(diagramEditor5, LC1_LABEL, LC1Bounds, LC1Bounds);
+
+        // check style
+        checkOrangeDiamondStyle(diagramEditor5, LC1_LABEL);
+    }
+
+    /**
+     * Test that the paste style changes style on the expected figure. This test
+     * uses the copy-paste style on Diagram using the
+     * org.eclipse.sirius.diagram.ui.layoutDataManager extension-point (the
+     * sampleNameDataProvider contributed in oes.tests.junit plug-in). Style of
+     * node LC2 from a first diagram is applied on node LC1 from a second
+     * diagram.
+     * <ul>
+     * <li>Check node location and style before paste on rep5</li>
+     * <li>Run copy-paste Style from rep8 to rep5</li>
+     * <li>Check node locations and style after copy-paste on rep5. Check style
+     * node changes into workspace Image.</li>
+     * </ul>
+     */
+    public void testNodeToNodeCopyPasteWSImageStyleOnDiagramWithExtension() {
+        diagramEditor8.show();
+        // Copy LC1 Style
+        diagramEditor8.click(LC2_POINT);
+        diagramEditor8.clickContextMenu(Messages.CopyFormatAction_text);
+        diagramEditor5.show();
+
+        // Check LogicalFunction1 node locations before the paste style.
+        Rectangle LC1Bounds = checkNodeBounds(diagramEditor5, LC1_LABEL, INITIAL_LC1_SQUARE_NODE_BOUNDS, INITIAL_LC1_SQUARE_NODE_BOUNDS);
+
+        // Check LogicalFunction2 node locations before the paste style.
+        checkNodeBounds(diagramEditor5, LC2_LABEL, INITIAL_LC2_SQUARE_NODE_BOUNDS, INITIAL_LC2_SQUARE_NODE_BOUNDS);
+
+        // check LogicalFunction1 node style before the paste style.
+        checkGraySquareStyle(diagramEditor5, LC1_LABEL);
+
+        // Paste style on second representation
+        diagramEditor5.click(EMPTY_POINT);
+        diagramEditor5.clickContextMenu(Messages.PasteStyleAction_text);
+
+        // Check LogicalFunction1 node locations does not change after the paste
+        // style.
+        checkNodeBounds(diagramEditor5, LC1_LABEL, LC1Bounds, LC1Bounds);
+
+        // Check that the style has changed
+        checkWSFigureStyle(diagramEditor5, LC1_LABEL);
+    }
+
+    /**
+     * Test that the paste style and layout changes style on the expected figure
+     * and puts the elements at the expected location. This test uses the
+     * copy-paste layout and style on Diagram using the
+     * org.eclipse.sirius.diagram.ui.layoutDataManager extension-point (the
+     * sampleNameDataProvider contributed in oes.tests.junit plug-in). Style and
+     * layout of node LC2 from a first diagram is applied on node LC1 from a
+     * second diagram.
+     * <ul>
+     * <li>Check node locations before copy-paste on rep3</li>
+     * <li>Run copy-paste Style from rep6 to rep5</li>
+     * <li>Check style node changes into yellow ellipse.</li>
+     * <li>Check location changes.</li>
+     * </ul>
+     */
+    public void testNodeToNodeCopyPasteEllipseLayoutAndStyleOnDiagramWithExtension() {
+        diagramEditor6.show();
+        // Check LogicalFunction2 node locations before the copy layout and
+        // style.
+        Rectangle LC2Diag6Bounds = checkNodeBounds(diagramEditor6, LC2_LABEL, NEW_STYLE_LC2_NODE_BOUNDS, NEW_STYLE_LC2_NODE_BOUNDS);
+
+        // Copy LC1 layout and Style
+        diagramEditor6.click(LC2_POINT);
+        diagramEditor6.clickContextMenu(Messages.CopyFormatAction_text);
+
+        diagramEditor5.show();
+
+        // Check LogicalFunction1 node locations before the paste layout and
+        // style.
+        checkNodeBounds(diagramEditor5, LC1_LABEL, INITIAL_LC1_SQUARE_NODE_BOUNDS, INITIAL_LC1_SQUARE_NODE_BOUNDS);
+
+        // Check LogicalFunction2 node locations before the paste layout and
+        // style.
+        Rectangle LC2Diag5Bounds = checkNodeBounds(diagramEditor5, LC2_LABEL, INITIAL_LC2_SQUARE_NODE_BOUNDS, INITIAL_LC2_SQUARE_NODE_BOUNDS);
+
+        // check LogicalFunction1 node style before the paste style.
+        checkGraySquareStyle(diagramEditor5, LC1_LABEL);
+
+        // Paste layout on second representation
+        diagramEditor5.click(EMPTY_POINT);
+        diagramEditor5.clickContextMenu(Messages.PasteFormatAction_text);
+
+        // Check LogicalFunction1 node locations after the paste layout.
+        // By using diagram extension, it matches with LC2 bounds of diagram6
+        // representation (LC2 annotation on LC1).
+        checkNodeBounds(diagramEditor5, LC1_LABEL, LC2Diag6Bounds, LC2Diag6Bounds);
+        // Check LogicalFunction2 node locations does not change after the paste
+        // layout (no annotation on LC2).
+        checkNodeBounds(diagramEditor5, LC2_LABEL, LC2Diag5Bounds, LC2Diag5Bounds);
+
+        // Check style
+        checkYellowEllipseStyle(diagramEditor5, LC1_LABEL);
+    }
+
+    /**
+     * Test that the paste style and layout changes style on the expected figure
+     * and puts the elements at the expected location. This test uses the
+     * copy-paste layout and style on Diagram using the
+     * org.eclipse.sirius.diagram.ui.layoutDataManager extension-point (the
+     * sampleNameDataProvider contributed in oes.tests.junit plug-in). Style and
+     * layout of node LC2 from a first diagram is applied on node LC1 from a
+     * second diagram.
+     * <ul>
+     * <li>Check node locations before copy-paste on rep3</li>
+     * <li>Run copy-paste Style from rep7 to rep5</li>
+     * <li>Check style node changes into orange diamonds.</li>
+     * <li>Check location changes.</li>
+     * <li>Check label style changes.</li>
+     * </ul>
+     */
+    public void testNodeToNodeCopyPasteDiamondLayoutAndStyleOnDiagramWithExtension() {
+        diagramEditor7.show();
+        // Check LogicalFunction2 node locations before the copy layout and
+        // style.
+        Rectangle LC2Diag7Bounds = checkNodeBounds(diagramEditor7, LC2_LABEL, NEW_STYLE_LC2_NODE_BOUNDS, NEW_STYLE_LC2_NODE_BOUNDS);
+
+        // Copy LC1 layout and style
+        diagramEditor7.click(LC2_POINT);
+        diagramEditor7.clickContextMenu(Messages.CopyFormatAction_text);
+
+        diagramEditor5.show();
+
+        // Check LogicalFunction1 node locations before the paste layout and
+        // style.
+        checkNodeBounds(diagramEditor5, LC1_LABEL, INITIAL_LC1_SQUARE_NODE_BOUNDS, INITIAL_LC1_SQUARE_NODE_BOUNDS);
+
+        // Check LogicalFunction2 node locations before the paste layout and
+        // style.
+        Rectangle LC2Diag5Bounds = checkNodeBounds(diagramEditor5, LC2_LABEL, INITIAL_LC2_SQUARE_NODE_BOUNDS, INITIAL_LC2_SQUARE_NODE_BOUNDS);
+
+        // check LogicalFunction1 node style before the paste style.
+        checkGraySquareStyle(diagramEditor5, LC1_LABEL);
+
+        // Paste layout on second representation
+        diagramEditor5.click(EMPTY_POINT);
+        diagramEditor5.clickContextMenu(Messages.PasteFormatAction_text);
+
+        // Check LogicalFunction1 node locations after the paste layout.
+        // By using diagram extension, it matches with LC2 bounds of diagram7
+        // representation (LC2 annotation on LC1).
+        checkNodeBounds(diagramEditor5, LC1_LABEL, LC2Diag7Bounds, LC2Diag7Bounds);
+        // Check LogicalFunction2 node locations does not change after the paste
+        // layout (no annotation on LC2).
+        checkNodeBounds(diagramEditor5, LC2_LABEL, LC2Diag5Bounds, LC2Diag5Bounds);
+
+        // Check style
+        checkOrangeDiamondStyle(diagramEditor5, LC1_LABEL);
+    }
+
+    /**
+     * Test that the paste style and layout changes style on the expected figure
+     * and puts the elements at the expected location. This test uses the
+     * copy-paste layout and style on Diagram using the
+     * org.eclipse.sirius.diagram.ui.layoutDataManager extension-point (the
+     * sampleNameDataProvider contributed in oes.tests.junit plug-in). Style and
+     * layout of node LC2 from a first diagram is applied on node LC1 from a
+     * second diagram.
+     * <ul>
+     * <li>Check node locations before copy-paste on rep3</li>
+     * <li>Run copy-paste Style from rep8 to rep5</li>
+     * <li>Check style node changes into thux workspace image.</li>
+     * <li>Check location changes.</li>
+     * </ul>
+     */
+    public void testNodeToNodeCopyPasteImageLayoutAndStyleOnDiagramWithExtension() {
+        diagramEditor8.show();
+        // Check LogicalFunction2 node locations before the copy layout and
+        // style.
+        Rectangle LC2Diag8Bounds = checkNodeBounds(diagramEditor8, LC2_LABEL, NEW_STYLE_LC2_NODE_BOUNDS, NEW_STYLE_LC2_NODE_BOUNDS);
+
+        // Copy LC1 layout
+        diagramEditor8.click(LC2_POINT);
+        diagramEditor8.clickContextMenu(Messages.CopyFormatAction_text);
+
+        diagramEditor5.show();
+
+        // Check LogicalFunction1 node locations before the paste layout and
+        // style.
+        checkNodeBounds(diagramEditor5, LC1_LABEL, INITIAL_LC1_SQUARE_NODE_BOUNDS, INITIAL_LC1_SQUARE_NODE_BOUNDS);
+
+        // Check LogicalFunction2 node locations before the paste layout and
+        // style.
+        Rectangle LC2Diag5Bounds = checkNodeBounds(diagramEditor5, LC2_LABEL, INITIAL_LC2_SQUARE_NODE_BOUNDS, INITIAL_LC2_SQUARE_NODE_BOUNDS);
+
+        // check LogicalFunction1 node style before the paste style.
+        checkGraySquareStyle(diagramEditor5, LC1_LABEL);
+
+        // Paste layout on second representation
+        diagramEditor5.click(EMPTY_POINT);
+        diagramEditor5.clickContextMenu(Messages.PasteFormatAction_text);
+
+        // Check LogicalFunction1 node locations after the paste layout.
+        // By using diagram extension, it matches with LC2 bounds of diagram8
+        // representation (LC2 annotation on LC1).
+        checkNodeBounds(diagramEditor5, LC1_LABEL, LC2Diag8Bounds, LC2Diag8Bounds);
+        // Check LogicalFunction2 node locations does not change after the paste
+        // layout (no annotation on LC2).
+        checkNodeBounds(diagramEditor5, LC2_LABEL, LC2Diag5Bounds, LC2Diag5Bounds);
+
+        // Check style
+        checkWSFigureStyle(diagramEditor5, LC1_LABEL);
+    }
+
+    /**
+     * Check that the container bounds (GMF and Draw2D) are as expected.
+     * 
+     * @param editorToCheck
+     *            diagram editor to check
+     * @param label
+     *            Label of the container to check.
+     * @param expectedGmfBounds
+     *            The GMF expected bounds
+     * @param expectedFigureBounds
+     *            The draw2d expected bounds. If the x, y , width or height in
+     *            this bounds is equal to -1, we don't check it. This is useful
+     *            in case of size that depends on Font (with different result
+     *            according to OS).
+     */
+    private Rectangle checkContainerBounds(SWTBotSiriusDiagramEditor editorToCheck, String label, Rectangle expectedGmfBounds, Rectangle expectedFigureBounds) {
+        SWTBotGefEditPart editPart = editorToCheck.getEditPart(label, AbstractDiagramElementContainerEditPart.class);
+        if (editPart != null) {
+            AbstractDiagramElementContainerEditPart part = (AbstractDiagramElementContainerEditPart) editPart.part();
+            return comparBoundsFromPart(label, expectedGmfBounds, expectedFigureBounds, part);
+        }
+        return null;
+    }
+
+    /**
+     * Check that the node bounds (GMF and Draw2D) are as expected.
+     * 
+     * @param editorToCheck
+     *            diagram editor to check
+     * @param label
+     *            Label of the node to check.
+     * @param expectedGmfBounds
+     *            The GMF expected bounds
+     * @param expectedFigureBounds
+     *            The draw2d expected bounds. If the x, y , width or height in
+     *            this bounds is equal to -1, we don't check it. This is useful
+     *            in case of size that depends on Font (with different result
+     *            according to OS).
+     */
+    private Rectangle checkNodeBounds(SWTBotSiriusDiagramEditor editorToCheck, String label, Rectangle expectedGmfBounds, Rectangle expectedFigureBounds) {
+        SWTBotGefEditPart editPart = editorToCheck.getEditPart(label, AbstractDiagramNodeEditPart.class);
+        if (editPart != null) {
+            AbstractDiagramNodeEditPart part = (AbstractDiagramNodeEditPart) editPart.part();
+            return comparBoundsFromPart(label, expectedGmfBounds, expectedFigureBounds, part);
+        }
+        return null;
+    }
+
+    /**
+     * Compare expected and obtained bounds (GMF and Draw2D) from an edit part.
+     * 
+     * @param label
+     *            Label of the container to check.
+     * @param expectedGmfBounds
+     *            The GMF expected bounds
+     * @param expectedFigureBounds
+     *            The draw2d expected bounds. If the x, y , width or height in
+     *            this bounds is equal to -1, we don't check it. This is useful
+     *            in case of size that depends on Font (with different result
+     *            according to OS).
+     * @param part
+     *            edit part to compare
+     */
+    private Rectangle comparBoundsFromPart(String label, Rectangle expectedGmfBounds, Rectangle expectedFigureBounds, AbstractBorderedShapeEditPart part) {
+        IFigure mainFigure = part.getMainFigure();
+        Rectangle bounds = mainFigure.getBounds();
+        assertEquals("Wrong GMF bounds for " + label, expectedGmfBounds, getBounds((Node) part.getNotationView()));
+        if (expectedFigureBounds.x() != -1 && expectedFigureBounds.y() != -1 && expectedFigureBounds.width() != -1 && expectedFigureBounds.height() != -1) {
+            assertEquals("Wrong Draw2D bounds for " + label, expectedFigureBounds, bounds);
+        } else {
+            if (expectedFigureBounds.x() != -1) {
+                assertEquals("Wrong Draw2D x for " + label, expectedFigureBounds.x(), bounds.x());
+            }
+            if (expectedFigureBounds.y() != -1) {
+                assertEquals("Wrong Draw2D y for " + label, expectedFigureBounds.y(), bounds.y());
+            }
+            if (expectedFigureBounds.width() != -1) {
+                assertEquals("Wrong Draw2D width for " + label, expectedFigureBounds.width(), bounds.width());
+            }
+            if (expectedFigureBounds.height() != -1) {
+                assertEquals("Wrong Draw2D height for " + label, expectedFigureBounds.height(), bounds.height());
+            }
+        }
+        return bounds;
+    }
+
+    private Rectangle getBounds(Node notationView) {
+        Rectangle bounds = new Rectangle();
+        LayoutConstraint layoutConstraint = notationView.getLayoutConstraint();
+        if (layoutConstraint instanceof Location) {
+            Location location = (Location) layoutConstraint;
+            bounds.setLocation(location.getX(), location.getY());
+        }
+        if (layoutConstraint instanceof Size) {
+            Size size = (Size) layoutConstraint;
+            bounds.setSize(size.getWidth(), size.getHeight());
+        }
+        return bounds;
+    }
+
+    /**
+     * Check that style of the node matches with gray square.
+     * 
+     * @param editorToCheck
+     *            diagram editor to check
+     * @param label
+     *            Label of the node to check.
+     */
+    private void checkGraySquareStyle(SWTBotSiriusDiagramEditor editorToCheck, String label) {
+        SWTBotGefEditPart editPart = editorToCheck.getEditPart(label, AbstractDiagramNodeEditPart.class);
+        if (editPart != null) {
+            AbstractDiagramNodeEditPart part = (AbstractDiagramNodeEditPart) editPart.part();
+            Object shape = part.getStyleEditPart().getFigure().getChildren().get(0);
+            assertTrue("The shape of figure for " + label + " must be a square.", shape instanceof SquareFigure);
+            Color gray = new Color(null, 136, 136, 136);
+            try {
+                assertEquals("The color of figure for " + label + " must be gray.", gray, ((Shape) shape).getBackgroundColor());
+            } finally {
+                gray.dispose();
+            }
+        }
+    }
+
+    /**
+     * Check that style of the node matches with orange diamond.
+     * 
+     * @param editorToCheck
+     *            diagram editor to check
+     * @param label
+     *            Label of the node to check.
+     */
+    private void checkOrangeDiamondStyle(SWTBotSiriusDiagramEditor editorToCheck, String label) {
+        SWTBotGefEditPart editPart = editorToCheck.getEditPart(label, AbstractDiagramNodeEditPart.class);
+        if (editPart != null) {
+            AbstractDiagramNodeEditPart part = (AbstractDiagramNodeEditPart) editPart.part();
+            Object shape = part.getStyleEditPart().getFigure().getChildren().get(0);
+            assertTrue("The shape of figure for " + label + " must be a diamond.", shape instanceof LozengeFigure);
+            Color orange = new Color(null, 252, 175, 62);
+            Color blue = new Color(null, 152, 168, 191);
+            try {
+                assertEquals("The color of figure for " + label + " must be orange.", orange, ((Shape) shape).getBackgroundColor());
+                assertEquals("The color of the label for " + label + " must be blue.", blue, ((IFigure) ((Shape) shape).getChildren().get(0)).getForegroundColor());
+            } finally {
+                orange.dispose();
+                blue.dispose();
+            }
+        }
+    }
+
+    /**
+     * Check that style of the node matches with yellow ellipse.
+     * 
+     * @param editorToCheck
+     *            diagram editor to check
+     * @param label
+     *            Label of the node to check.
+     */
+    private void checkYellowEllipseStyle(SWTBotSiriusDiagramEditor editorToCheck, String label) {
+        SWTBotGefEditPart editPart = editorToCheck.getEditPart(label, AbstractDiagramNodeEditPart.class);
+        if (editPart != null) {
+            AbstractDiagramNodeEditPart part = (AbstractDiagramNodeEditPart) editPart.part();
+            Object shape = part.getStyleEditPart().getFigure().getChildren().get(0);
+            assertTrue("The shape of figure for " + label + " must be an ellipse.", shape instanceof ODesignEllipseFigure);
+            Color yellow = new Color(null, 252, 233, 79);
+            try {
+                assertEquals("The color of figure for " + label + " must be yellow.", yellow, ((Shape) shape).getBackgroundColor());
+            } finally {
+                yellow.dispose();
+            }
+        }
+    }
+
+    /**
+     * Check that style of the node matches with thux workspace image.
+     * 
+     * @param editorToCheck
+     *            diagram editor to check
+     * @param label
+     *            Label of the node to check.
+     */
+    private void checkWSFigureStyle(SWTBotSiriusDiagramEditor editorToCheck, String label) {
+        SWTBotGefEditPart editPart = editorToCheck.getEditPart(label, AbstractDiagramNodeEditPart.class);
+        if (editPart != null) {
+            AbstractDiagramNodeEditPart part = (AbstractDiagramNodeEditPart) editPart.part();
+            Object shape = part.getStyleEditPart().getFigure().getChildren().get(0);
+            assertTrue("The shape of figure " + label + " must be a workspace image.", shape instanceof SVGWorkspaceImageFigure);
+            String[] uri = ((SVGWorkspaceImageFigure) shape).getURI().split("/");
+            String imageName = uri[uri.length - 1];
+            assertEquals("The workspace Image figure for " + label + " must reference Tux.svg image.", "Tux.svg", imageName);
+        }
+    }
+}
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeCopyPasteFormatTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeCopyPasteFormatTest.java
new file mode 100644
index 0000000000..a72bc876bb
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeCopyPasteFormatTest.java
@@ -0,0 +1,400 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2016 THALES GLOBAL SERVICES.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.tests.swtbot.layout;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.notation.Bounds;
+import org.eclipse.gmf.runtime.notation.LayoutConstraint;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.RoutingStyle;
+import org.eclipse.gmf.runtime.notation.Size;
+import org.eclipse.sirius.diagram.DDiagram;
+import org.eclipse.sirius.diagram.EdgeStyle;
+import org.eclipse.sirius.diagram.business.internal.metamodel.spec.DEdgeSpec;
+import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeEditPart;
+import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeNameEditPart;
+import org.eclipse.sirius.diagram.ui.provider.Messages;
+import org.eclipse.sirius.tests.swtbot.Activator;
+import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
+import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
+import org.eclipse.sirius.tests.swtbot.support.api.condition.CheckSelectedCondition;
+import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor;
+import org.eclipse.sirius.tests.unit.diagram.layout.data.manager.extension.SampleNameDataProvider;
+import org.eclipse.sirius.viewpoint.DRepresentationElement;
+import org.eclipse.sirius.viewpoint.RGBValues;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
+
+/**
+ * Copy Paste Layout manage specific custom style (Jump Links, Smoothness). This
+ * test, test copy layout and style from representation with edge with JumpLinks
+ * with 'Above' status and with 'Chamfered' Type, with smoothness set to normal
+ * and paste this layout on representation with no custom style. Check that the
+ * custom style was applied to new representation. Copy Paste Layout should not
+ * set a Location during paste layout for edge labels with copied (-1,-1)
+ * default size: resize label will be forbidden.
+ * 
+ * @author jdupont
+ */
+public class EdgeCopyPasteFormatTest extends AbstractSiriusSwtBotGefTestCase {
+
+    /** Orange color. */
+    private static final Color ORANGE = new Color(null, 252, 175, 62, 255);
+
+    /** Gray color. */
+    private static final Color GRAY = new Color(null, 136, 136, 136, 255);
+
+    /** Point used to copy Layout. */
+    private static final Point FIRST_POINT = new Point(1, 1);
+
+    /** Point used to paste layout which do not reference any edit part. */
+    private static final Point SECOND_POINT = new Point(500, 250);
+
+    private static final String NONE_SMOOTHNESS = "None";
+
+    private static final String NORMAL_SMOOTHNESS = "Normal";
+
+    private static final String ABOVE_LINK_STATUS = "Above";
+
+    private static final String BELOW_LINK_STATUS = "Below";
+
+    private static final String NONE_LINK_STATUS = NONE_SMOOTHNESS;
+
+    private static final String CHAMFERED_LINK_TYPE = "Chamfered";
+
+    private static final String SEMICIRCLE_LINK_TYPE = "Semicircle";
+
+    private static final String SQUARE_LINK_TYPE = "Square";
+
+    private static final String REPRESENTATION_NAME1 = "root package entities";
+
+    private static final String REPRESENTATION_NAME2 = "root package entities sans layout";
+
+    private static final String REPRESENTATION_NAME3 = "rootPackageEntitiesAdaptedForCopyPasteFormatTest";
+
+    private static final String REPRESENTATION_NAME4 = "rootPackageEntitiesSansLayoutAdaptedForCopyPasteFormatTest";
+
+    private static final String REPRESENTATION_DESCRIPTION_NAME = "Entities";
+
+    private static final String MODEL = "My.ecore";
+
+    private static final String SESSION_FILE = "My.aird";
+
+    private static final String DATA_UNIT_DIR = "data/unit/layout/edgeCopyPasteLayout/";
+
+    private static final String FILE_DIR = "/";
+
+    private static final String REFERENCE1 = "[0..1] newEReference1";
+
+    private static final String REFERENCE2 = "[0..1] newEReference2";
+
+    /**
+     * Diagram on first representation.
+     */
+    private SWTBotSiriusDiagramEditor diagram1;
+
+    /**
+     * Diagram on second representation.
+     */
+    private SWTBotSiriusDiagramEditor diagram2;
+
+    /**
+     * Diagram on third representation using a specific copy/paste extension (
+     * {@link SampleNameDataProvider}).
+     */
+    private SWTBotSiriusDiagramEditor diagram3;
+
+    /**
+     * Diagram on fourth representation using a specific copy/paste extension (
+     * {@link SampleNameDataProvider}).
+     */
+    private SWTBotSiriusDiagramEditor diagram4;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void onSetUpBeforeClosingWelcomePage() throws Exception {
+        copyFileToTestProject(Activator.PLUGIN_ID, DATA_UNIT_DIR, MODEL, SESSION_FILE);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void onSetUpAfterOpeningDesignerPerspective() throws Exception {
+        final UIResource sessionAirdResource = new UIResource(designerProject, FILE_DIR, SESSION_FILE);
+        localSession = designerPerspective.openSessionFromFile(sessionAirdResource);
+        // Open the 4 representations
+        diagram1 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME1, DDiagram.class);
+        diagram2 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME2, DDiagram.class);
+        diagram3 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME3, DDiagram.class);
+        diagram4 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME4, DDiagram.class);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void tearDown() throws Exception {
+        diagram1 = null;
+        diagram2 = null;
+        diagram3 = null;
+        diagram4 = null;
+        super.tearDown();
+    }
+
+    /**
+     * Test that the paste layout affect custom style for edges.
+     */
+    public void testEdgeCopyPasteLayout() {
+        // Check style of the first representation : it should have custom style
+        // and not the second
+        checkLayoutStyleReferences(diagram1, REFERENCE1, ABOVE_LINK_STATUS, CHAMFERED_LINK_TYPE, NONE_SMOOTHNESS, true);
+        checkLayoutStyleReferences(diagram1, REFERENCE2, NONE_LINK_STATUS, SEMICIRCLE_LINK_TYPE, NORMAL_SMOOTHNESS, false);
+        // Check style of the second representation : it should have no custom
+        // style
+        checkLayoutStyleReferences(diagram2, REFERENCE1, NONE_LINK_STATUS, SEMICIRCLE_LINK_TYPE, NONE_SMOOTHNESS, false);
+        checkLayoutStyleReferences(diagram2, REFERENCE2, NONE_LINK_STATUS, SEMICIRCLE_LINK_TYPE, NONE_SMOOTHNESS, false);
+        // Select all elements on first representation and copy layout.
+        diagram1.show();
+        diagram1.click(FIRST_POINT);
+        diagram1.clickContextMenu(Messages.CopyFormatAction_text);
+        // Paste layout on second representation
+        diagram2.show();
+        diagram2.click(SECOND_POINT);
+        diagram2.clickContextMenu(Messages.PasteLayoutAction_text);
+        // Check Routing style and layout constraints on second representation
+        // (should have custom style)
+        checkLayoutStyleReferences(diagram2, REFERENCE1, ABOVE_LINK_STATUS, CHAMFERED_LINK_TYPE, NONE_SMOOTHNESS, true);
+        checkLayoutStyleReferences(diagram2, REFERENCE2, NONE_LINK_STATUS, SEMICIRCLE_LINK_TYPE, NORMAL_SMOOTHNESS, false);
+    }
+
+    /**
+     * Test that the paste layout affect custom style for edges from and to
+     * diagrams using a specific copy/paste extension (
+     * {@link SampleNameDataProvider}).
+     */
+    public void testEdgeCopyPasteLayoutUsingDiagramsWithExtension() {
+        // Check style of the first representation : it should have custom style
+        // and not the second
+        checkLayoutStyleReferences(diagram3, REFERENCE1, ABOVE_LINK_STATUS, CHAMFERED_LINK_TYPE, NONE_SMOOTHNESS, true);
+        checkLayoutStyleReferences(diagram3, REFERENCE2, BELOW_LINK_STATUS, SQUARE_LINK_TYPE, NORMAL_SMOOTHNESS, true);
+        checkEdgeColor(diagram3, REFERENCE2, ORANGE, "Orange");
+        // Check style of the second representation : it should have no custom
+        // style
+        checkLayoutStyleReferences(diagram4, REFERENCE1, NONE_LINK_STATUS, SEMICIRCLE_LINK_TYPE, NONE_SMOOTHNESS, false);
+        checkLayoutStyleReferences(diagram4, REFERENCE2, NONE_LINK_STATUS, SEMICIRCLE_LINK_TYPE, NONE_SMOOTHNESS, false);
+        checkEdgeColor(diagram4, REFERENCE1, GRAY, "Gray");
+        // Select all elements on first representation and copy layout.
+        diagram3.show();
+        diagram3.click(FIRST_POINT);
+        diagram3.clickContextMenu(Messages.CopyFormatAction_text);
+        // Paste layout on second representation
+        diagram4.show();
+        diagram4.click(SECOND_POINT);
+        diagram4.clickContextMenu(Messages.PasteLayoutAction_text);
+        // Check Routing style and layout constraints on second representation
+        checkLayoutStyleReferences(diagram4, REFERENCE1, BELOW_LINK_STATUS, SQUARE_LINK_TYPE, NORMAL_SMOOTHNESS, true);
+        // Check style on second representation has not been changed
+        checkEdgeColor(diagram4, REFERENCE1, GRAY, "Gray");
+    }
+
+    /**
+     * Test that the paste style affect custom style for edges from and to
+     * diagrams using a specific copy/paste extension (
+     * {@link SampleNameDataProvider}).
+     */
+    public void testEdgeCopyPasteStyleUsingDiagramsWithExtension() {
+        // Check style of the first representation : it should have custom style
+        // and not the second
+        checkLayoutStyleReferences(diagram3, REFERENCE1, ABOVE_LINK_STATUS, CHAMFERED_LINK_TYPE, NONE_SMOOTHNESS, true);
+        checkLayoutStyleReferences(diagram3, REFERENCE2, BELOW_LINK_STATUS, SQUARE_LINK_TYPE, NORMAL_SMOOTHNESS, true);
+        checkEdgeColor(diagram3, REFERENCE2, ORANGE, "Orange");
+        // Check style of the second representation : it should have no custom
+        // style
+        checkLayoutStyleReferences(diagram4, REFERENCE1, NONE_LINK_STATUS, SEMICIRCLE_LINK_TYPE, NONE_SMOOTHNESS, false);
+        checkLayoutStyleReferences(diagram4, REFERENCE2, NONE_LINK_STATUS, SEMICIRCLE_LINK_TYPE, NONE_SMOOTHNESS, false);
+        checkEdgeColor(diagram4, REFERENCE1, GRAY, "Gray");
+        checkEdgeColor(diagram4, REFERENCE2, GRAY, "Gray");
+        // Select all elements on first representation and copy layout.
+        diagram3.show();
+        diagram3.click(FIRST_POINT);
+        diagram3.clickContextMenu(Messages.CopyFormatAction_text);
+        // Paste layout on second representation
+        diagram4.show();
+        diagram4.click(SECOND_POINT);
+        diagram4.clickContextMenu(Messages.PasteStyleAction_text);
+        // Check Routing style and layout constraints on second representation
+        // does not change
+        checkLayoutStyleReferences(diagram4, REFERENCE1, NONE_LINK_STATUS, SEMICIRCLE_LINK_TYPE, NONE_SMOOTHNESS, false);
+        // Check style on second representation change in orange
+        checkEdgeColor(diagram4, REFERENCE1, ORANGE, "Orange");
+    }
+
+    /**
+     * Test that the paste format affect custom style for edges from and to
+     * diagrams using a specific copy/paste extension (
+     * {@link SampleNameDataProvider}).
+     */
+    public void testEdgeCopyPasteFormatUsingDiagramsWithExtension() {
+        // Check style of the first representation : it should have custom style
+        // and not the second
+        checkLayoutStyleReferences(diagram3, REFERENCE1, ABOVE_LINK_STATUS, CHAMFERED_LINK_TYPE, NONE_SMOOTHNESS, true);
+        checkLayoutStyleReferences(diagram3, REFERENCE2, BELOW_LINK_STATUS, SQUARE_LINK_TYPE, NORMAL_SMOOTHNESS, true);
+        checkEdgeColor(diagram3, REFERENCE2, ORANGE, "Orange");
+        // Check style of the second representation : it should have no custom
+        // style
+        checkLayoutStyleReferences(diagram4, REFERENCE1, NONE_LINK_STATUS, SEMICIRCLE_LINK_TYPE, NONE_SMOOTHNESS, false);
+        checkLayoutStyleReferences(diagram4, REFERENCE2, NONE_LINK_STATUS, SEMICIRCLE_LINK_TYPE, NONE_SMOOTHNESS, false);
+        checkEdgeColor(diagram4, REFERENCE1, GRAY, "Gray");
+        checkEdgeColor(diagram4, REFERENCE2, GRAY, "Gray");
+        // Select all elements on first representation and copy layout.
+        diagram3.show();
+        diagram3.click(FIRST_POINT);
+        diagram3.clickContextMenu(Messages.CopyFormatAction_text);
+        // Paste layout on second representation
+        diagram4.show();
+        diagram4.click(SECOND_POINT);
+        diagram4.clickContextMenu(Messages.PasteFormatAction_text);
+        // Check Routing style and layout constraints on second representation
+        // does not change on REFERENCE2 but change on REFERENCE1 (target ref1
+        // is map
+        // to source ref2)
+        checkLayoutStyleReferences(diagram4, REFERENCE2, NONE_LINK_STATUS, SEMICIRCLE_LINK_TYPE, NONE_SMOOTHNESS, false);
+        checkLayoutStyleReferences(diagram4, REFERENCE1, BELOW_LINK_STATUS, SQUARE_LINK_TYPE, NORMAL_SMOOTHNESS, true);
+        // Check style on second representation change in orange for ref1
+        checkEdgeColor(diagram4, REFERENCE2, GRAY, "Gray");
+        checkEdgeColor(diagram4, REFERENCE1, ORANGE, "Orange");
+    }
+
+    /**
+     * Check layout style references layout.
+     * 
+     * @param diagramEditor
+     *            diagram representation
+     * @param reference
+     *            name of the reference to check
+     * @param jumpLinkStatus
+     *            jump link status expected for the reference
+     * @param jumpLinkType
+     *            jump link type expected for the reference
+     * @param smoothness
+     *            smoothness expected for the reference
+     * @param reverseJumpLink
+     *            reverse jump link expected for the reference
+     */
+    private void checkLayoutStyleReferences(SWTBotSiriusDiagramEditor diagramEditor, String reference, String jumpLinkStatus, String jumpLinkType, String smoothness, boolean reverseJumpLink) {
+        SWTBotGefEditPart botGef = selectEditPart(diagramEditor, reference, DEdgeEditPart.class);
+        checkRoutingStyle(botGef, jumpLinkStatus, jumpLinkType, smoothness, reverseJumpLink);
+        SWTBotGefEditPart label = diagramEditor.getEditPart(reference, DEdgeNameEditPart.class);
+        checkLayoutConstraint(label);
+    }
+
+    /**
+     * Check routing style for a given reference.
+     * 
+     * @param bot
+     *            reference edit part to check
+     * @param jumpLinkStatus
+     *            jump link status expected for the reference
+     * @param jumpLinkType
+     *            jump link type expected for the reference
+     * @param smoothness
+     *            smoothness expected for the reference
+     * @param reverseJumpLink
+     *            reverse jump link expected for the reference
+     */
+    private void checkRoutingStyle(SWTBotGefEditPart bot, String jumpLinkStatus, String jumpLinkType, String smoothness, boolean reverseJumpLink) {
+        RoutingStyle routingStyle = (RoutingStyle) ((org.eclipse.gmf.runtime.notation.Edge) bot.part().getModel()).getStyle(NotationPackage.eINSTANCE.getRoutingStyle());
+        assertEquals("The Jump Link Status should be equals to '" + jumpLinkStatus + "'", jumpLinkStatus, routingStyle.getJumpLinkStatus().getLiteral());
+        assertEquals("The Jump Link Type should be equals to '" + jumpLinkType + "'", jumpLinkType, routingStyle.getJumpLinkType().getLiteral());
+        assertEquals("The Smoothness should be equals to '" + smoothness + "'", smoothness, routingStyle.getSmoothness().getLiteral());
+        if (reverseJumpLink) {
+            assertEquals("The reverse Jump Link should be checked", reverseJumpLink, routingStyle.isJumpLinksReverse());
+        } else {
+            assertEquals("The reverse Jump Link should not be checked", reverseJumpLink, routingStyle.isJumpLinksReverse());
+        }
+    }
+
+    /**
+     * Check layout Constraint for a given reference.
+     * 
+     * @param label
+     *            The label of the edit part to check
+     */
+    private void checkLayoutConstraint(SWTBotGefEditPart label) {
+        LayoutConstraint constraint = ((org.eclipse.gmf.runtime.notation.Node) label.part().getModel()).getLayoutConstraint();
+        assertTrue("The layout constraint should be a org.eclipse.gmf.runtime.notation.Bounds)", constraint instanceof Bounds);
+
+        Size size = (Size) constraint;
+        assertEquals("Default width value (-1) expected.", -1, size.getWidth());
+        assertEquals("Default height value (-1) expected.", -1, size.getHeight());
+    }
+
+    /**
+     * Select an edit part from a diagram editor.
+     * 
+     * @param diagramEditor
+     *            diagram representation
+     * @param name
+     *            name of the edit part to select
+     * @param type
+     *            type of the edit Part to select
+     * @return the edit part selected
+     */
+    private SWTBotGefEditPart selectEditPart(SWTBotSiriusDiagramEditor diagramEditor, String name, Class<? extends EditPart> type) {
+        SWTBotGefEditPart botPart = diagramEditor.getEditPart(name, type);
+        assertNotNull("The requested edit part should not be null", botPart);
+        botPart.select();
+        bot.waitUntil(new CheckSelectedCondition(diagramEditor, name));
+        return botPart;
+    }
+
+    /**
+     * Check edge color for a given reference.
+     * 
+     * @param diagramEditor
+     *            diagram representation
+     * @param reference
+     *            name of the reference to check
+     * @param color
+     *            expected color
+     * @param colorName
+     *            expected color name
+     */
+    private void checkEdgeColor(SWTBotSiriusDiagramEditor diagramEditor, String reference, Color color, String colorName) {
+        for (DRepresentationElement representationElement : diagramEditor.getDRepresentation().getRepresentationElements()) {
+            if (representationElement instanceof DEdgeSpec) {
+                DEdgeSpec edge = (DEdgeSpec) representationElement;
+                if (reference.equals(edge.getName())) {
+                    assertTrue("The color of edge " + reference + " must be " + colorName, isSameColor(((EdgeStyle) edge.getStyle()).getStrokeColor(), color));
+                    return;
+                }
+            }
+        }
+    }
+
+    /**
+     * Compare two colors.
+     * 
+     * @param color
+     *            the first color to compare
+     * @param colorRef
+     *            the second color to compare
+     * @return true if color are the same, false otherwise.
+     */
+    private boolean isSameColor(RGBValues color, Color colorRef) {
+        return color.getBlue() == colorRef.getBlue() && color.getGreen() == colorRef.getGreen() && color.getRed() == colorRef.getRed();
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeCopyPasteLayoutTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeCopyPasteLayoutTest.java
deleted file mode 100644
index 8d15f11f85..0000000000
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeCopyPasteLayoutTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.tests.swtbot.layout;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.notation.Bounds;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.RoutingStyle;
-import org.eclipse.gmf.runtime.notation.Size;
-import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeEditPart;
-import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeNameEditPart;
-import org.eclipse.sirius.tests.swtbot.Activator;
-import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
-import org.eclipse.sirius.tests.swtbot.support.api.business.UIDiagramRepresentation;
-import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
-import org.eclipse.sirius.tests.swtbot.support.api.condition.CheckSelectedCondition;
-import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
-
-/**
- * Copy Paste Layout manage specific custom style (Jump Links,
- * Smoothness). This test, test copy layout from representation with edge with
- * JumpLinks with 'Above' status and with 'Chamfered' Type, with smoothness set
- * to normal and paste this layout on representation with no custom style. Check
- * that the custom style was applied to new representation.
- * 
- * Copy Paste Layout should not set a Location during paste
- * layout for edge labels with copied (-1,-1) default size: resize label will be
- * forbidden.
- * 
- * @author jdupont
- */
-public class EdgeCopyPasteLayoutTest extends AbstractSiriusSwtBotGefTestCase {
-
-    private static final String VIEWPOINT_NAME = "Design";
-
-    private static final String REPRESENTATION_NAME1 = "root package entities";
-
-    private static final String REPRESENTATION_NAME2 = "root package entities sans layout";
-
-    private static final String REPRESENTATION_DESCRIPTION_NAME = "Entities";
-
-    private static final String MODEL = "My.ecore";
-
-    private static final String SESSION_FILE = "My.aird";
-
-    private static final String DATA_UNIT_DIR = "data/unit/layout/edgeCopyPasteLayout/";
-
-    private static final String FILE_DIR = "/";
-
-    private static final String REFERENCE1 = "[0..1] newEReference1";
-
-    private static final String REFERENCE2 = "[0..1] newEReference2";
-
-    /**
-     * Diagram on first representation.
-     */
-    private UIDiagramRepresentation diagram1;
-
-    /**
-     * Diagram on second representation.
-     */
-    private UIDiagramRepresentation diagram2;
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void onSetUpBeforeClosingWelcomePage() throws Exception {
-        copyFileToTestProject(Activator.PLUGIN_ID, DATA_UNIT_DIR, MODEL, SESSION_FILE);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void onSetUpAfterOpeningDesignerPerspective() throws Exception {
-        final UIResource sessionAirdResource = new UIResource(designerProject, FILE_DIR, SESSION_FILE);
-        localSession = designerPerspective.openSessionFromFile(sessionAirdResource);
-        // Open the 2 representations
-        diagram1 = localSession.getLocalSessionBrowser().perCategory().selectViewpoint(VIEWPOINT_NAME).selectRepresentation(REPRESENTATION_DESCRIPTION_NAME)
-                .selectRepresentationInstance(REPRESENTATION_NAME1, UIDiagramRepresentation.class).open();
-        diagram2 = localSession.getLocalSessionBrowser().perCategory().selectViewpoint(VIEWPOINT_NAME).selectRepresentation(REPRESENTATION_DESCRIPTION_NAME)
-                .selectRepresentationInstance(REPRESENTATION_NAME2, UIDiagramRepresentation.class).open();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        diagram1 = null;
-        diagram2 = null;
-        super.tearDown();
-    }
-
-    /**
-     * Test that the paste layout affect custom style for edges.
-     */
-    public void testEdgeCopyPasteLayout() {
-
-        // Check style of 2 representations. The fist should be have custom
-        // style and not the second
-        editor = diagram1.getEditor();
-        SWTBotGefEditPart botGef = selectAndCheckEditPart(REFERENCE1, DEdgeEditPart.class);
-        checkRoutingStyle(botGef, "Above", "Chamfered", "None", true);
-        SWTBotGefEditPart label = editor.getEditPart(REFERENCE1, DEdgeNameEditPart.class);
-        checkLayoutConstraint(label);
-        botGef = selectAndCheckEditPart(REFERENCE2, DEdgeEditPart.class);
-        checkRoutingStyle(botGef, "None", "Semicircle", "Normal", false);
-        label = editor.getEditPart(REFERENCE1, DEdgeNameEditPart.class);
-        checkLayoutConstraint(label);
-        editor = diagram2.getEditor();
-        botGef = selectAndCheckEditPart(REFERENCE1, DEdgeEditPart.class);
-        checkRoutingStyle(botGef, "None", "Semicircle", "None", false);
-        label = editor.getEditPart(REFERENCE1, DEdgeNameEditPart.class);
-        checkLayoutConstraint(label);
-        botGef = selectAndCheckEditPart(REFERENCE2, DEdgeEditPart.class);
-        checkRoutingStyle(botGef, "None", "Semicircle", "None", false);
-        label = editor.getEditPart(REFERENCE1, DEdgeNameEditPart.class);
-        checkLayoutConstraint(label);
-        // Select all elements on first representation and copy layout.
-        editor = diagram1.getEditor();
-        editor.show();
-        editor.click(new Point(1, 1));
-        editor.clickContextMenu("Copy layout");
-        // Paste layout on second representation
-        editor = diagram2.getEditor();
-        editor.show();
-        editor.click(new Point(500, 250));
-        editor.clickContextMenu("Paste layout");
-        // Check style on second representation (should be have custom style)
-        botGef = selectAndCheckEditPart(REFERENCE1, DEdgeEditPart.class);
-        checkRoutingStyle(botGef, "Above", "Chamfered", "None", true);
-        label = editor.getEditPart(REFERENCE1, DEdgeNameEditPart.class);
-        checkLayoutConstraint(label);
-        botGef = selectAndCheckEditPart(REFERENCE2, DEdgeEditPart.class);
-        checkRoutingStyle(botGef, "None", "Semicircle", "Normal", false);
-        label = editor.getEditPart(REFERENCE1, DEdgeNameEditPart.class);
-        checkLayoutConstraint(label);
-    }
-
-    private SWTBotGefEditPart selectAndCheckEditPart(String name, Class<? extends EditPart> type) {
-        SWTBotGefEditPart botPart = editor.getEditPart(name, type);
-        assertNotNull("The requested edit part should not be null", botPart);
-        botPart.select();
-        bot.waitUntil(new CheckSelectedCondition(editor, name));
-        return botPart;
-    }
-
-    private void checkRoutingStyle(SWTBotGefEditPart bot, String jumpLinkStatus, String jumpLinkType, String smoothness, boolean reverseJumpLink) {
-        RoutingStyle routingStyle = (RoutingStyle) ((org.eclipse.gmf.runtime.notation.Edge) bot.part().getModel()).getStyle(NotationPackage.eINSTANCE.getRoutingStyle());
-        assertEquals("The Jump Link Status should be equals to '" + jumpLinkStatus + "'", jumpLinkStatus, routingStyle.getJumpLinkStatus().getLiteral());
-        assertEquals("The Jump Link Type should be equals to '" + jumpLinkType + "'", jumpLinkType, routingStyle.getJumpLinkType().getLiteral());
-        assertEquals("The Smoothness should be equals to '" + smoothness + "'", smoothness, routingStyle.getSmoothness().getLiteral());
-        if (reverseJumpLink) {
-            assertEquals("The reverse Jump Link should be checked", reverseJumpLink, routingStyle.isJumpLinksReverse());
-        } else {
-            assertEquals("The reverse Jump Link should not be checked", reverseJumpLink, routingStyle.isJumpLinksReverse());
-        }
-    }
-
-    /**
-     * @param label
-     */
-    private void checkLayoutConstraint(SWTBotGefEditPart label) {
-        LayoutConstraint constraint = ((org.eclipse.gmf.runtime.notation.Node) label.part().getModel()).getLayoutConstraint();
-        assertTrue("The layout constraint should be a org.eclipse.gmf.runtime.notation.Bounds)", constraint instanceof Bounds);
-
-        Size size = (Size) constraint;
-        assertEquals("Default width value (-1) expected.", -1, size.getWidth());
-        assertEquals("Default height value (-1) expected.", -1, size.getHeight());
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeStabilityOnCopyPasteLayoutTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeStabilityOnCopyPasteLayoutTest.java
index 1a9b363b56..9547968058 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeStabilityOnCopyPasteLayoutTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeStabilityOnCopyPasteLayoutTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2014, 2016 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ import org.eclipse.gef.ConnectionEditPart;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramBorderNodeEditPart;
 import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramEdgeEditPart.ViewEdgeFigure;
+import org.eclipse.sirius.diagram.ui.provider.Messages;
 import org.eclipse.sirius.tests.swtbot.Activator;
 import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
@@ -88,12 +89,12 @@ public class EdgeStabilityOnCopyPasteLayoutTest extends AbstractSiriusSwtBotGefT
             // Step 1: copy the layout of the first diagram
             diagramToCopy.show();
             diagramToCopy.click(new Point(1, 1));
-            diagramToCopy.clickContextMenu("Copy layout");
+            diagramToCopy.clickContextMenu(Messages.CopyFormatAction_text);
 
             // Step 2: paste the layout on the second diagram
             diagramToPaste.show();
             diagramToPaste.click(new Point(450, 100));
-            diagramToPaste.clickContextMenu("Paste layout");
+            diagramToPaste.clickContextMenu(Messages.PasteLayoutAction_text);
 
             // Step 3: check the stability of the edges
             checkEdgeStability(ECLASS1, ECLASS3, getBendpoints(diagramToCopy, ECLASS1, ECLASS3), getBendpoints(diagramToPaste, ECLASS1, ECLASS3));
@@ -120,11 +121,11 @@ public class EdgeStabilityOnCopyPasteLayoutTest extends AbstractSiriusSwtBotGefT
             PointList originalPointList2 = getBendpoints(diagramToCopyPaste, ECLASS2, ECLASS4).getCopy();
 
             diagramToCopyPaste.click(new Point(1, 1));
-            diagramToCopyPaste.clickContextMenu("Copy layout");
+            diagramToCopyPaste.clickContextMenu(Messages.CopyFormatAction_text);
 
             // Step 2: paste the layout on the same diagram
             diagramToCopyPaste.click(new Point(1, 1));
-            diagramToCopyPaste.clickContextMenu("Paste layout");
+            diagramToCopyPaste.clickContextMenu(Messages.PasteLayoutAction_text);
 
             // Step 3: check the stability of the edges
             checkEdgeStability(ECLASS1, ECLASS3, originalPointList1, getBendpoints(diagramToCopyPaste, ECLASS1, ECLASS3));
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java
index 070b6e308c..927dd70c75 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java
@@ -35,10 +35,11 @@ import org.eclipse.sirius.tests.swtbot.editor.vsm.ResizeKindEditorTest;
 import org.eclipse.sirius.tests.swtbot.editor.vsm.VSMFieldTest;
 import org.eclipse.sirius.tests.swtbot.editor.vsm.ValidationEmptyNameTest;
 import org.eclipse.sirius.tests.swtbot.editor.vsm.ViewpointSpecificationProjectCreationTest;
-import org.eclipse.sirius.tests.swtbot.layout.BorderedNodeCopyPastLayoutTest;
+import org.eclipse.sirius.tests.swtbot.layout.BorderedNodeCopyPasteFormatTest;
+import org.eclipse.sirius.tests.swtbot.layout.ContainerAndNodeCopyPasteFormatTest;
 import org.eclipse.sirius.tests.swtbot.layout.ContainerDefaultSizeLayoutTest;
 import org.eclipse.sirius.tests.swtbot.layout.EdgeAndPortStabilityOnSemanticChangeTest;
-import org.eclipse.sirius.tests.swtbot.layout.EdgeCopyPasteLayoutTest;
+import org.eclipse.sirius.tests.swtbot.layout.EdgeCopyPasteFormatTest;
 import org.eclipse.sirius.tests.swtbot.layout.EdgeLayoutStabilityWithToolWizardTest;
 import org.eclipse.sirius.tests.swtbot.layout.EdgeStabilityOnCopyPasteLayoutTest;
 import org.eclipse.sirius.tests.swtbot.layout.LayoutStabilityOnManualRefreshTest;
@@ -60,7 +61,7 @@ import org.eclipse.sirius.tests.swtbot.tabbar.ResetToDefaultFiltersActionTests;
 import org.eclipse.sirius.tests.swtbot.tabbar.TabBarTest;
 import org.eclipse.sirius.tests.swtbot.tabbar.TabbarContributorExtensionTest;
 import org.eclipse.sirius.tests.swtbot.table.SetPropertyOfTableTreeByPropertiesViewTest;
-import org.eclipse.sirius.tests.swtbot.uml.CopyPasteLayoutOfLabelOfBorderedNodeTest;
+import org.eclipse.sirius.tests.swtbot.uml.CopyPasteFormatOfLabelOfBorderedNodeTest;
 import org.eclipse.sirius.tests.swtbot.uml.CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest;
 import org.eclipse.sirius.tests.swtbot.uml.CopyPasteLayoutOfPortsWithConflictWithPastedPortsTest;
 import org.eclipse.sirius.tests.swtbot.uml.PortLocationAfterDragAndDropOnDiagramTest;
@@ -260,7 +261,7 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(PortLocationAfterDragAndDropOnDiagramTest.class);
         suite.addTestSuite(CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest.class);
         suite.addTestSuite(CopyPasteLayoutOfPortsWithConflictWithPastedPortsTest.class);
-        suite.addTestSuite(CopyPasteLayoutOfLabelOfBorderedNodeTest.class);
+        suite.addTestSuite(CopyPasteFormatOfLabelOfBorderedNodeTest.class);
         suite.addTestSuite(NodeBorderLabelPositionStabilityTest.class);
         suite.addTestSuite(EdgeLayoutStabilityWithToolWizardTest.class);
         suite.addTestSuite(EdgeStabilityOnCopyPasteLayoutTest.class);
@@ -371,10 +372,11 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(PropertyViewOnModelExplorerSelectionTests.class);
         suite.addTestSuite(ContextualMenuTest.class);
         suite.addTestSuite(BracketEdgeTests.class);
-        suite.addTestSuite(EdgeCopyPasteLayoutTest.class);
+        suite.addTestSuite(EdgeCopyPasteFormatTest.class);
         suite.addTestSuite(BendpointsStabilityOnMovesTest.class);
         suite.addTestSuite(BendpointsStabilityOnMovesSpecificCasesTest.class);
-        suite.addTestSuite(BorderedNodeCopyPastLayoutTest.class);
+        suite.addTestSuite(BorderedNodeCopyPasteFormatTest.class);
+        suite.addTestSuite(ContainerAndNodeCopyPasteFormatTest.class);
         suite.addTestSuite(ContainerDefaultSizeLayoutTest.class);
         suite.addTestSuite(ModifyEdgeLayoutAfterRefreshTest.class);
         suite.addTest(TreeSwtbotTestSuite.suite());
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteFormatOfLabelOfBorderedNodeTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteFormatOfLabelOfBorderedNodeTest.java
new file mode 100644
index 0000000000..d86d1fe107
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteFormatOfLabelOfBorderedNodeTest.java
@@ -0,0 +1,177 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2016 THALES GLOBAL SERVICES.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.tests.swtbot.uml;
+
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.notation.Bounds;
+import org.eclipse.gmf.runtime.notation.Location;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.sirius.diagram.DDiagram;
+import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramNameEditPart;
+import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeNameEditPart;
+import org.eclipse.sirius.diagram.ui.provider.Messages;
+import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
+
+/**
+ * This test check that a pasted Node corresponding to the label of a bordered
+ * node has {@link Location} as constraint (and not {@link Bounds}).
+ * 
+ * @See VP-3292.
+ * @author lredor
+ */
+public class CopyPasteFormatOfLabelOfBorderedNodeTest extends AbstractUmlDragAndDropTest {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected String getRepresentationNameToOpen() {
+        return "DnD Component Diagram";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected String getRepresentationDescriptionName() {
+        return "Component Diagram";
+    }
+
+    /**
+     * This test check that the pasted location of bordered nodes is the same as
+     * the copied location if the location is already occupied by another port
+     * that is also pasted.@See VP-3099.<BR>
+     * Also Check that only the layout of the label of border node is paste when
+     * launching Paste Layout action.
+     */
+    public void testCopyPasteLayout() {
+        Color red = new Color(null, 227, 164, 156);
+        try {
+            final EditPart srcLabelEditPart = editor.getEditPart("DropPort", AbstractDiagramNameEditPart.class).part();
+            assertTrue("The model of the DropPort editPart in source diagram should be a Node", srcLabelEditPart.getModel() instanceof Node);
+            assertTrue("The constraint of the Node of the label \"DropPort\" should be a Location.", ((Node) srcLabelEditPart.getModel()).getLayoutConstraint() instanceof Location);
+            Point sourceLabelLocation = new Point(((Location) ((Node) srcLabelEditPart.getModel()).getLayoutConstraint()).getX(),
+                    ((Location) ((Node) srcLabelEditPart.getModel()).getLayoutConstraint()).getY());
+            checkBorderNodeLabelColor(srcLabelEditPart, red, "Red");
+            // Launch copy layout
+            editor.clickContextMenu(Messages.CopyFormatAction_text);
+            // Open the second editor to paste in
+            final SWTBotSiriusDiagramEditor editorForPaste = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), getRepresentationDescriptionName(),
+                    "Component Diagram - Paste to", DDiagram.class);
+            // Launch paste layout
+            editorForPaste.clickContextMenu(Messages.PasteLayoutAction_text);
+            // Check that the layout constraint of the Label is a Location (and
+            // not
+            // a Bounds)
+            final SWTBotGefEditPart editPartBot = editorForPaste.getEditPart("DropPort", AbstractDiagramNameEditPart.class);
+            assertTrue("The model of the DropPort editPart should be a Node", editPartBot.part().getModel() instanceof Node);
+            assertTrue("The constraint of the Node of the label \"DropPort\" should be a Location (and not a Bounds).",
+                    !(((Node) editPartBot.part().getModel()).getLayoutConstraint() instanceof Bounds) && ((Node) editPartBot.part().getModel()).getLayoutConstraint() instanceof Location);
+            // Check that the label location has changed
+            Point currentPoint = new Point(((Location) ((Node) editPartBot.part().getModel()).getLayoutConstraint()).getX(),
+                    ((Location) ((Node) editPartBot.part().getModel()).getLayoutConstraint()).getY());
+            assertEquals("The location should be the same as the source after the paste layout", sourceLabelLocation, currentPoint);
+            // Check that the color has not changed
+            checkBorderNodeLabelColor(editPartBot.part(), ColorConstants.black, "Black");
+        } finally {
+            red.dispose();
+        }
+    }
+
+    /**
+     * Check that only the style of the label of border node is paste when
+     * launching Paste Style action.
+     */
+    public void testCopyPasteStyle() {
+        Color red = new Color(null, 227, 164, 156);
+        try {
+            final EditPart srcLabelEditPart = editor.getEditPart("DropPort", AbstractDiagramNameEditPart.class).part();
+            checkBorderNodeLabelColor(srcLabelEditPart, red, "Red");
+            // Launch copy layout
+            editor.clickContextMenu(Messages.CopyFormatAction_text);
+            // Open the second editor to paste in
+            final SWTBotSiriusDiagramEditor editorForPaste = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), getRepresentationDescriptionName(),
+                    "Component Diagram - Paste to", DDiagram.class);
+            final SWTBotGefEditPart editPartBot = editorForPaste.getEditPart("DropPort", AbstractDiagramNameEditPart.class);
+            assertTrue("The model of the DropPort editPart should be a Node", editPartBot.part().getModel() instanceof Node);
+            assertTrue("The constraint of the Node of the label \"DropPort\" should be a Location (and not a Bounds).",
+                    !(((Node) editPartBot.part().getModel()).getLayoutConstraint() instanceof Bounds) && ((Node) editPartBot.part().getModel()).getLayoutConstraint() instanceof Location);
+            Point targetLabelLocation = new Point(((Location) ((Node) editPartBot.part().getModel()).getLayoutConstraint()).getX(),
+                    ((Location) ((Node) editPartBot.part().getModel()).getLayoutConstraint()).getY());
+            // Launch paste layout
+            editorForPaste.clickContextMenu(Messages.PasteStyleAction_text);
+            // Check that the layout constraint of the Label is a Location (and
+            // not a Bounds)
+            assertTrue("The model of the DropPort editPart should be a Node", editPartBot.part().getModel() instanceof Node);
+            assertTrue("The constraint of the Node of the label \"DropPort\" should be a Location (and not a Bounds).",
+                    !(((Node) editPartBot.part().getModel()).getLayoutConstraint() instanceof Bounds) && ((Node) editPartBot.part().getModel()).getLayoutConstraint() instanceof Location);
+            // Check that the label location has not changed
+            Point currentPoint = new Point(((Location) ((Node) editPartBot.part().getModel()).getLayoutConstraint()).getX(),
+                    ((Location) ((Node) editPartBot.part().getModel()).getLayoutConstraint()).getY());
+            assertEquals("The location should unchanged after the paste style", targetLabelLocation, currentPoint);
+            // Check that the color has changed
+            checkBorderNodeLabelColor(editPartBot.part(), red, "Red");
+        } finally {
+            red.dispose();
+        }
+
+    }
+
+    /**
+     * Check that layout and style of the label of border node is paste when
+     * launching Paste Format action.
+     */
+    public void testCopyPasteFormat() {
+        Color red = new Color(null, 227, 164, 156);
+        try {
+            final EditPart srcLabelEditPart = editor.getEditPart("DropPort", AbstractDiagramNameEditPart.class).part();
+            assertTrue("The model of the DropPort editPart in source diagram should be a Node", srcLabelEditPart.getModel() instanceof Node);
+            assertTrue("The constraint of the Node of the label \"DropPort\" should be a Location.", ((Node) srcLabelEditPart.getModel()).getLayoutConstraint() instanceof Location);
+            Point sourceLabelLocation = new Point(((Location) ((Node) srcLabelEditPart.getModel()).getLayoutConstraint()).getX(),
+                    ((Location) ((Node) srcLabelEditPart.getModel()).getLayoutConstraint()).getY());
+            checkBorderNodeLabelColor(srcLabelEditPart, red, "Red");
+            // Launch copy layout
+            editor.clickContextMenu(Messages.CopyFormatAction_text);
+            // Open the second editor to paste in
+            final SWTBotSiriusDiagramEditor editorForPaste = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), getRepresentationDescriptionName(),
+                    "Component Diagram - Paste to", DDiagram.class);
+            // Launch paste layout
+            editorForPaste.clickContextMenu(Messages.PasteFormatAction_text);
+            // Check that the layout constraint of the Label is a Location (and
+            // not
+            // a Bounds)
+            final SWTBotGefEditPart editPartBot = editorForPaste.getEditPart("DropPort", AbstractDiagramNameEditPart.class);
+            assertTrue("The model of the DropPort editPart should be a Node", editPartBot.part().getModel() instanceof Node);
+            assertTrue("The constraint of the Node of the label \"DropPort\" should be a Location (and not a Bounds).",
+                    !(((Node) editPartBot.part().getModel()).getLayoutConstraint() instanceof Bounds) && ((Node) editPartBot.part().getModel()).getLayoutConstraint() instanceof Location);
+            // Check that the label location has changed
+            Point currentPoint = new Point(((Location) ((Node) editPartBot.part().getModel()).getLayoutConstraint()).getX(),
+                    ((Location) ((Node) editPartBot.part().getModel()).getLayoutConstraint()).getY());
+            assertEquals("The location should be the same as the source after the paste layout", sourceLabelLocation, currentPoint);
+            // Check that the color has changed
+            checkBorderNodeLabelColor(editPartBot.part(), red, "Red");
+        } finally {
+            red.dispose();
+        }
+
+    }
+
+    private void checkBorderNodeLabelColor(EditPart srcLabelEditPart, Color color, String nameColor) {
+        if (srcLabelEditPart instanceof DNodeNameEditPart) {
+            DNodeNameEditPart nameEditPart = (DNodeNameEditPart) srcLabelEditPart;
+            // // Check color
+            assertEquals("The color of the label must be " + nameColor, color, nameEditPart.getFigure().getForegroundColor());
+        }
+    }
+}
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteLayoutOfLabelOfBorderedNodeTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteLayoutOfLabelOfBorderedNodeTest.java
deleted file mode 100644
index 5b08421250..0000000000
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteLayoutOfLabelOfBorderedNodeTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.tests.swtbot.uml;
-
-import org.eclipse.gmf.runtime.notation.Bounds;
-import org.eclipse.gmf.runtime.notation.Location;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramNameEditPart;
-import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor;
-import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
-
-/**
- * This test check that a pasted Node corresponding to the label of a bordered
- * node has {@link Location} as constraint (and not {@link Bounds}).
- * 
- * @See VP-3292.
- * @author lredor
- */
-public class CopyPasteLayoutOfLabelOfBorderedNodeTest extends AbstractUmlDragAndDropTest {
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected String getRepresentationNameToOpen() {
-        return "DnD Component Diagram";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected String getRepresentationDescriptionName() {
-        return "Component Diagram";
-    }
-
-    /**
-     * This test check that the pasted location of bordered nodes is the same as
-     * the copied location if the location is already occupied by another port
-     * that is also pasted.
-     * 
-     * @See VP-3099.
-     */
-    public void testCopyPaste() {
-        // Launch copy layout
-        editor.clickContextMenu("Copy layout");
-        // Open the second editor to paste in
-        final SWTBotSiriusDiagramEditor editorForPaste = openDiagram(localSession.getOpenedSession(), getRepresentationDescriptionName(), "Component Diagram - Paste to", DDiagram.class);
-        // Launch paste layout
-        editorForPaste.clickContextMenu("Paste layout");
-        // Check that the layout constraint of the Label is a Location (and not
-        // a Bounds)
-        final SWTBotGefEditPart editPartBot = editorForPaste.getEditPart("DropPort", AbstractDiagramNameEditPart.class);
-        assertTrue("The model of the DropPort editPart should be a Node", editPartBot.part().getModel() instanceof Node);
-        assertTrue("The constraint of the Node of the label \"DropPort\" should be a Location (and not a Bounds).", !(((Node) editPartBot.part().getModel()).getLayoutConstraint() instanceof Bounds)
-                && ((Node) editPartBot.part().getModel()).getLayoutConstraint() instanceof Location);
-    }
-}
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest.java
index 2d7843292c..8b489d1a0f 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.ui.business.api.query.NodeQuery;
 import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramBorderNodeEditPart;
+import org.eclipse.sirius.diagram.ui.provider.Messages;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor;
 import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
@@ -67,7 +68,7 @@ public class CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest extends Ab
      */
     public void testCopyPaste() {
         // Launch copy layout
-        editor.clickContextMenu("Copy layout");
+        editor.clickContextMenu(Messages.CopyFormatAction_text);
         // Open the second editor to paste in
         final SWTBotSiriusDiagramEditor editorForPaste = openDiagram(localSession.getOpenedSession(), getRepresentationDescriptionName(), "conflictsWithNotPasteElements-paste", DDiagram.class);
         // Check that the location of ports to paste is the same as other ports
@@ -77,7 +78,7 @@ public class CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest extends Ab
         assertSameLocation(editor, "Port3", editorForPaste, "Port8", errorMessage);
         assertSameLocation(editor, "Port4", editorForPaste, "Port5", errorMessage);
         // Launch paste layout
-        editorForPaste.clickContextMenu("Paste layout");
+        editorForPaste.clickContextMenu(Messages.PasteLayoutAction_text);
         // Check that the location of pasted ports is near to the original
         // copied location. A delta of 11 is tolerated (because they will be
         // shifted under or above the existing ports).
@@ -101,7 +102,7 @@ public class CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest extends Ab
         editor = openAndGetEditor(getRepresentationDescriptionName(), "collapseWithConflicts1-copy");
 
         // Launch copy layout
-        editor.clickContextMenu("Copy layout");
+        editor.clickContextMenu(Messages.CopyFormatAction_text);
         // Open the second editor to paste in
         final SWTBotSiriusDiagramEditor editorForPaste = openDiagram(localSession.getOpenedSession(), getRepresentationDescriptionName(), "collapseWithConflicts1-paste", DDiagram.class);
         // Check that the location of ports to paste is the same as other ports
@@ -112,7 +113,7 @@ public class CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest extends Ab
         String errorMessage2 = "The copied {0} bounds should contains the location of the {1} in diagram to paste.";
         assertLocationIsIncludedInBounds(editorForPaste, "Port2", editor, "Port1", errorMessage2);
         // Launch paste layout
-        editorForPaste.clickContextMenu("Paste layout");
+        editorForPaste.clickContextMenu(Messages.PasteLayoutAction_text);
         // Check that the location of pasted ports is near to the original
         // copied location. A delta of 11 is tolerated (because they will be
         // shifted under or above the existing ports).
@@ -139,7 +140,7 @@ public class CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest extends Ab
         editor = openAndGetEditor(getRepresentationDescriptionName(), "collapseWithConflicts2-copy");
 
         // Launch copy layout
-        editor.clickContextMenu("Copy layout");
+        editor.clickContextMenu(Messages.CopyFormatAction_text);
         // Open the second editor to paste in
         final SWTBotSiriusDiagramEditor editorForPaste = openDiagram(localSession.getOpenedSession(), getRepresentationDescriptionName(), "collapseWithConflicts2-paste", DDiagram.class);
         // Check that the location of port to paste is included in one of the
@@ -147,7 +148,7 @@ public class CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest extends Ab
         String errorMessage2 = "The copied {0} location should be contained in the bounds of the {1} in diagram to paste.";
         assertLocationIsIncludedInBounds(editor, "Port2", editorForPaste, "Port1", errorMessage2);
         // Launch paste layout
-        editorForPaste.clickContextMenu("Paste layout");
+        editorForPaste.clickContextMenu(Messages.PasteLayoutAction_text);
         // Check that the location of pasted ports is near to the original
         // copied location. A delta of 11 is tolerated (because they will be
         // shifted under or above the existing ports).
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteLayoutOfPortsWithConflictWithPastedPortsTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteLayoutOfPortsWithConflictWithPastedPortsTest.java
index 079b71fb7f..4eb589120c 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteLayoutOfPortsWithConflictWithPastedPortsTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/uml/CopyPasteLayoutOfPortsWithConflictWithPastedPortsTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2016 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,6 +11,7 @@
 package org.eclipse.sirius.tests.swtbot.uml;
 
 import org.eclipse.sirius.diagram.DDiagram;
+import org.eclipse.sirius.diagram.ui.provider.Messages;
 import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor;
 
 /**
@@ -47,7 +48,7 @@ public class CopyPasteLayoutOfPortsWithConflictWithPastedPortsTest extends Abstr
      */
     public void testCopyPaste() {
         // Launch copy layout
-        editor.clickContextMenu("Copy layout");
+        editor.clickContextMenu(Messages.CopyFormatAction_text);
         // Open the second editor to paste in
         final SWTBotSiriusDiagramEditor editorForPaste = openDiagram(localSession.getOpenedSession(), getRepresentationDescriptionName(), "conflictsWithOtherPasteElements-paste", DDiagram.class);
         // Check that the location of ports to paste is the same as other ports
@@ -57,7 +58,7 @@ public class CopyPasteLayoutOfPortsWithConflictWithPastedPortsTest extends Abstr
         assertSameLocation(editor, "Port3", editorForPaste, "Port1", errorMessage);
         assertSameLocation(editor, "Port4", editorForPaste, "Port3", errorMessage);
         // Launch paste layout
-        editorForPaste.clickContextMenu("Paste layout");
+        editorForPaste.clickContextMenu(Messages.PasteLayoutAction_text);
         // Add a click here to avoid the problem describe in VP-3874.
         // This test fails without this click since the commit "0f72210" of
         // VP-3856 that removes a refresh of the figure execute during the
author	Jessy Mallet	2016-06-28 14:07:36 +0000
committer	Laurent Redor	2016-07-08 11:19:02 +0000
commit	0019649cfd90381e34c632ddb8ced43eb0d69b4b (patch)
tree	4610c08375bb55e3971ffa31ae9cd52cc57ba24a
parent	cbdf959ee962aecbe4f56c6142a37705c2af0522 (diff)
download	org.eclipse.sirius-0019649cfd90381e34c632ddb8ced43eb0d69b4b.tar.gz org.eclipse.sirius-0019649cfd90381e34c632ddb8ced43eb0d69b4b.tar.xz org.eclipse.sirius-0019649cfd90381e34c632ddb8ced43eb0d69b4b.zip