diff --git a/repository/OpenPonk-BPMN/OPBPMNActivityShape.class.st b/repository/OpenPonk-BPMN/OPBPMNActivityShape.class.st
index f1975e8..cd9cbce 100644
--- a/repository/OpenPonk-BPMN/OPBPMNActivityShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNActivityShape.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'border'
 	],
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #'ston-core' }
diff --git a/repository/OpenPonk-BPMN/OPBPMNBoundaryEventShape.class.st b/repository/OpenPonk-BPMN/OPBPMNBoundaryEventShape.class.st
index ef6c21b..40547e4 100644
--- a/repository/OpenPonk-BPMN/OPBPMNBoundaryEventShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNBoundaryEventShape.class.st
@@ -5,7 +5,7 @@ Class {
 		'borderIn',
 		'borderOut'
 	],
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #connecting }
diff --git a/repository/OpenPonk-BPMN/OPBPMNCollapsedSubProcessShape.class.st b/repository/OpenPonk-BPMN/OPBPMNCollapsedSubProcessShape.class.st
index c55bcd3..3a029d7 100644
--- a/repository/OpenPonk-BPMN/OPBPMNCollapsedSubProcessShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNCollapsedSubProcessShape.class.st
@@ -5,7 +5,7 @@ Class {
 		'subprocessIcon',
 		'border'
 	],
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #'ston-core' }
diff --git a/repository/OpenPonk-BPMN/OPBPMNDataFlowShape.class.st b/repository/OpenPonk-BPMN/OPBPMNDataFlowShape.class.st
index cee09b3..85a9b37 100644
--- a/repository/OpenPonk-BPMN/OPBPMNDataFlowShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNDataFlowShape.class.st
@@ -5,7 +5,7 @@ Class {
 		'shape',
 		'borderColor'
 	],
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #rendering }
diff --git a/repository/OpenPonk-BPMN/OPBPMNDataObjectShape.class.st b/repository/OpenPonk-BPMN/OPBPMNDataObjectShape.class.st
index bc445f5..32dcbb6 100644
--- a/repository/OpenPonk-BPMN/OPBPMNDataObjectShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNDataObjectShape.class.st
@@ -1,11 +1,11 @@
 Class {
 	#name : #OPBPMNDataObjectShape,
-	#superclass : #OPShape,
+	#superclass : #OPBoundNode,
 	#instVars : [
 		'icon',
 		'borderColor'
 	],
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #update }
diff --git a/repository/OpenPonk-BPMN/OPBPMNEdgeLabel.class.st b/repository/OpenPonk-BPMN/OPBPMNEdgeLabel.class.st
index 266e326..4688f3e 100644
--- a/repository/OpenPonk-BPMN/OPBPMNEdgeLabel.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNEdgeLabel.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPBPMNEdgeLabel,
 	#superclass : #OPEdgeLabel,
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/repository/OpenPonk-BPMN/OPBPMNEdgeShape.class.st b/repository/OpenPonk-BPMN/OPBPMNEdgeShape.class.st
index 27f1fdd..698cbe6 100644
--- a/repository/OpenPonk-BPMN/OPBPMNEdgeShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNEdgeShape.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPBPMNEdgeShape,
 	#superclass : #OPEdge,
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/repository/OpenPonk-BPMN/OPBPMNEndEventShape.class.st b/repository/OpenPonk-BPMN/OPBPMNEndEventShape.class.st
index cb4a10c..b420564 100644
--- a/repository/OpenPonk-BPMN/OPBPMNEndEventShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNEndEventShape.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPBPMNEndEventShape,
 	#superclass : #OPBPMNEventShape,
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #connecting }
diff --git a/repository/OpenPonk-BPMN/OPBPMNEventShape.class.st b/repository/OpenPonk-BPMN/OPBPMNEventShape.class.st
index 3eedc08..b82c0e3 100644
--- a/repository/OpenPonk-BPMN/OPBPMNEventShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNEventShape.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPBPMNEventShape,
 	#superclass : #OPBPMNNodeShape,
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #connecting }
diff --git a/repository/OpenPonk-BPMN/OPBPMNFlowShape.class.st b/repository/OpenPonk-BPMN/OPBPMNFlowShape.class.st
index a74d523..f41257c 100644
--- a/repository/OpenPonk-BPMN/OPBPMNFlowShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNFlowShape.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'shape'
 	],
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/repository/OpenPonk-BPMN/OPBPMNGatewayShape.class.st b/repository/OpenPonk-BPMN/OPBPMNGatewayShape.class.st
index 20251a5..c79667c 100644
--- a/repository/OpenPonk-BPMN/OPBPMNGatewayShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNGatewayShape.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPBPMNGatewayShape,
 	#superclass : #OPBPMNNodeShape,
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #connecting }
diff --git a/repository/OpenPonk-BPMN/OPBPMNIntermediateEventShape.class.st b/repository/OpenPonk-BPMN/OPBPMNIntermediateEventShape.class.st
index 0822d45..7299828 100644
--- a/repository/OpenPonk-BPMN/OPBPMNIntermediateEventShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNIntermediateEventShape.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPBPMNIntermediateEventShape,
 	#superclass : #OPBPMNEventShape,
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #connecting }
diff --git a/repository/OpenPonk-BPMN/OPBPMNMessageShape.class.st b/repository/OpenPonk-BPMN/OPBPMNMessageShape.class.st
index ad4720e..9990152 100644
--- a/repository/OpenPonk-BPMN/OPBPMNMessageShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNMessageShape.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'shape'
 	],
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #hooks }
diff --git a/repository/OpenPonk-BPMN/OPBPMNNodeShape.class.st b/repository/OpenPonk-BPMN/OPBPMNNodeShape.class.st
index d4794b3..0c46f16 100644
--- a/repository/OpenPonk-BPMN/OPBPMNNodeShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNNodeShape.class.st
@@ -1,11 +1,11 @@
 Class {
 	#name : #OPBPMNNodeShape,
-	#superclass : #OPShape,
+	#superclass : #OPBoundNode,
 	#instVars : [
 		'icon',
 		'borderColor'
 	],
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #'ston-core' }
diff --git a/repository/OpenPonk-BPMN/OPBPMNPoolShape.class.st b/repository/OpenPonk-BPMN/OPBPMNPoolShape.class.st
index c1f9a39..523773d 100644
--- a/repository/OpenPonk-BPMN/OPBPMNPoolShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNPoolShape.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #OPBPMNPoolShape,
-	#superclass : #OPShape,
+	#superclass : #OPBoundNode,
 	#instVars : [
 		'label',
 		'laneLines',
@@ -9,7 +9,7 @@ Class {
 		'b2',
 		'borderColor'
 	],
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #adding }
diff --git a/repository/OpenPonk-BPMN/OPBPMNStartEventShape.class.st b/repository/OpenPonk-BPMN/OPBPMNStartEventShape.class.st
index f628a2c..fa492da 100644
--- a/repository/OpenPonk-BPMN/OPBPMNStartEventShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNStartEventShape.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'border'
 	],
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #connecting }
diff --git a/repository/OpenPonk-BPMN/OPBPMNSubProcessShape.class.st b/repository/OpenPonk-BPMN/OPBPMNSubProcessShape.class.st
index c51f489..296e6dd 100644
--- a/repository/OpenPonk-BPMN/OPBPMNSubProcessShape.class.st
+++ b/repository/OpenPonk-BPMN/OPBPMNSubProcessShape.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPBPMNSubProcessShape,
 	#superclass : #OPBPMNNodeShape,
-	#category : #'OpenPonk-BPMN-DiagramElements'
+	#category : #'OpenPonk-BPMN-Shapes'
 }
 
 { #category : #connecting }