diff --git a/repository/OpenPonk-Core/OPBoundary.class.st b/repository/OpenPonk-Core/OPBoundary.class.st
index d89cd820..35c1c80a 100644
--- a/repository/OpenPonk-Core/OPBoundary.class.st
+++ b/repository/OpenPonk-Core/OPBoundary.class.st
@@ -1,6 +1,8 @@
 Class {
 	#name : 'OPBoundary',
 	#superclass : 'OPDiagramOnlyShapeWithText',
+	#traits : 'OPTColoredAsFillAndBorderColoredAsStroke',
+	#classTraits : 'OPTColoredAsFillAndBorderColoredAsStroke classTrait',
 	#instVars : [
 		'name'
 	],
@@ -24,11 +26,23 @@ OPBoundary >> addSelectionDraggableInteraction [
 	@ OPRSSelectionDraggableBorder thatAlsoDragsContainedShapes
 ]
 
+{ #category : 'accessing' }
+OPBoundary >> defaultFillColor [
+
+	^ Color transparent
+]
+
 { #category : 'accessing' }
 OPBoundary >> defaultHeight [
 	^ 400
 ]
 
+{ #category : 'accessing' }
+OPBoundary >> defaultStrokeColor [
+
+	^ Color gray slightlyDarker
+]
+
 { #category : 'accessing' }
 OPBoundary >> defaultWidth [
 	^ 500
@@ -64,21 +78,17 @@ OPBoundary >> printOn: aStream [
 		nextPutAll: ''')'
 ]
 
-{ #category : 'creating - subelements' }
+{ #category : 'rendering' }
 OPBoundary >> renderBasicShape [
 
 	^ RSBox new
-		  color: Color transparent;
 		  width: self defaultWidth;
 		  height: self defaultHeight;
-		  borderDo: [ :border | 
-			  border
-				  color: Color gray;
-				  dashArray: #( 4 ) ];
+		  borderDo: [ :border | border dashArray: #( 4 ) ];
 		  yourself
 ]
 
-{ #category : 'creating - subelements' }
+{ #category : 'interactions' }
 OPBoundary >> selectableInteraction [
 
 	^ OPRSSelectable
diff --git a/repository/OpenPonk-Core/OPCommonElementController.class.st b/repository/OpenPonk-Core/OPCommonElementController.class.st
index 7965bbb9..7f45a6fe 100644
--- a/repository/OpenPonk-Core/OPCommonElementController.class.st
+++ b/repository/OpenPonk-Core/OPCommonElementController.class.st
@@ -45,6 +45,12 @@ OPCommonElementController >> isCommon [
 	^ true
 ]
 
+{ #category : 'testing' }
+OPCommonElementController >> isHideable [
+
+	^ false
+]
+
 { #category : 'accessing' }
 OPCommonElementController >> model [
 
diff --git a/repository/OpenPonk-Core/OPController.class.st b/repository/OpenPonk-Core/OPController.class.st
index 9191907d..b3e518dd 100644
--- a/repository/OpenPonk-Core/OPController.class.st
+++ b/repository/OpenPonk-Core/OPController.class.st
@@ -163,6 +163,7 @@ OPController >> internalUnsubscribeFrom: aModel [
 
 { #category : 'testing' }
 OPController >> isHideable [
+
 	^ false
 ]
 
diff --git a/repository/OpenPonk-Core/OPDiagramController.class.st b/repository/OpenPonk-Core/OPDiagramController.class.st
index 72c0c3e5..5204b047 100644
--- a/repository/OpenPonk-Core/OPDiagramController.class.st
+++ b/repository/OpenPonk-Core/OPDiagramController.class.st
@@ -767,7 +767,7 @@ OPDiagramController >> typeOfModel: aModel [
 	^ OPModelObjectType
 		named:
 			((aModel className withoutPrefix: self commonModelClassPrefix)
-				splitOnCapitals joinUsing: ' ')
+				splitCamelCase joinUsing: ' ')
 ]
 
 { #category : 'undo/redo' }
diff --git a/repository/OpenPonk-Core/OPDiagramElement.class.st b/repository/OpenPonk-Core/OPDiagramElement.class.st
index 67260793..57af048d 100644
--- a/repository/OpenPonk-Core/OPDiagramElement.class.st
+++ b/repository/OpenPonk-Core/OPDiagramElement.class.st
@@ -426,6 +426,13 @@ OPDiagramElement >> removeRender [
 	roassalShape := nil
 ]
 
+{ #category : 'accessing' }
+OPDiagramElement >> removeStylePropertyNamed: aName [
+
+	self localStyle ifNotNil: [ :style |
+		style removeKey: aName ifAbsent: [  ] ]
+]
+
 { #category : 'rendering' }
 OPDiagramElement >> renderBasicShape [
 
diff --git a/repository/OpenPonk-Core/OPDiagramOnlyShape.class.st b/repository/OpenPonk-Core/OPDiagramOnlyShape.class.st
index 8092f950..6aa31d1d 100644
--- a/repository/OpenPonk-Core/OPDiagramOnlyShape.class.st
+++ b/repository/OpenPonk-Core/OPDiagramOnlyShape.class.st
@@ -1,8 +1,6 @@
 Class {
 	#name : 'OPDiagramOnlyShape',
 	#superclass : 'OPBoundNode',
-	#traits : 'OPTBorderColoredAsStroke - {#updateRenderFromStyles}',
-	#classTraits : 'OPTBorderColoredAsStroke classTrait',
 	#instVars : [
 		'uuid',
 		'announcer'
@@ -67,12 +65,6 @@ OPDiagramOnlyShape >> modelElements: aCollection [
 	self shouldNotImplement
 ]
 
-{ #category : 'accessing' }
-OPDiagramOnlyShape >> strokeColor: aColor [
-
-	"ignore for now"
-]
-
 { #category : 'rendering' }
 OPDiagramOnlyShape >> updateRenderFromModel [
 
diff --git a/repository/OpenPonk-Core/OPEditElementTextCommand.class.st b/repository/OpenPonk-Core/OPEditElementTextCommand.class.st
index e5e17253..71d96f76 100644
--- a/repository/OpenPonk-Core/OPEditElementTextCommand.class.st
+++ b/repository/OpenPonk-Core/OPEditElementTextCommand.class.st
@@ -30,7 +30,7 @@ OPEditElementTextCommand class >> executeAccessor: anAccessor on: anObject [
 OPEditElementTextCommand >> accessor: anAccessor [
 	self getSelector: anAccessor.
 	self setSelector: anAccessor , ':'.
-	self name: (anAccessor capitalized splitOnCapitals joinUsing: ' ')
+	self name: (anAccessor capitalized splitCamelCase joinUsing: ' ')
 ]
 
 { #category : 'execute' }
diff --git a/repository/OpenPonk-Core/OPElementController.class.st b/repository/OpenPonk-Core/OPElementController.class.st
index 0cc2223a..30754a08 100644
--- a/repository/OpenPonk-Core/OPElementController.class.st
+++ b/repository/OpenPonk-Core/OPElementController.class.st
@@ -131,6 +131,12 @@ OPElementController >> isCommon [
 	^ false
 ]
 
+{ #category : 'testing' }
+OPElementController >> isHideable [
+
+	^ true
+]
+
 { #category : 'deprecated' }
 OPElementController >> loadModel [
 	self deprecated: 'Method will be removed without replacement.'
diff --git a/repository/OpenPonk-Core/OPNoModelAdapter.class.st b/repository/OpenPonk-Core/OPNoModelAdapter.class.st
new file mode 100644
index 00000000..de1a4954
--- /dev/null
+++ b/repository/OpenPonk-Core/OPNoModelAdapter.class.st
@@ -0,0 +1,29 @@
+Class {
+	#name : 'OPNoModelAdapter',
+	#superclass : 'Object',
+	#classInstVars : [
+		'instance'
+	],
+	#category : 'OpenPonk-Core-Adapters',
+	#package : 'OpenPonk-Core',
+	#tag : 'Adapters'
+}
+
+{ #category : 'accessing' }
+OPNoModelAdapter class >> instance [
+
+	^ instance ifNil: [ instance := self basicNew ]
+]
+
+{ #category : 'instance creation' }
+OPNoModelAdapter class >> new [
+
+	^ self instance
+]
+
+{ #category : 'initialization' }
+OPNoModelAdapter class >> reset [
+
+	<script>
+	instance := nil
+]
diff --git a/repository/OpenPonk-Core/OPNoShape.class.st b/repository/OpenPonk-Core/OPNoShape.class.st
index 227ab044..353b3811 100644
--- a/repository/OpenPonk-Core/OPNoShape.class.st
+++ b/repository/OpenPonk-Core/OPNoShape.class.st
@@ -1,11 +1,33 @@
 Class {
 	#name : 'OPNoShape',
 	#superclass : 'Object',
+	#classInstVars : [
+		'instance'
+	],
 	#category : 'OpenPonk-Core-DiagramElements',
 	#package : 'OpenPonk-Core',
 	#tag : 'DiagramElements'
 }
 
+{ #category : 'accessing' }
+OPNoShape class >> instance [
+
+	^ instance ifNil: [ instance := self basicNew ]
+]
+
+{ #category : 'instance creation' }
+OPNoShape class >> new [
+
+	^ self instance
+]
+
+{ #category : 'initialization' }
+OPNoShape class >> reset [
+
+	<script>
+	instance := nil
+]
+
 { #category : 'testing' }
 OPNoShape >> doesNotExist [
 
diff --git a/repository/OpenPonk-Core/OPNote.class.st b/repository/OpenPonk-Core/OPNote.class.st
index abc068df..11caf1b9 100644
--- a/repository/OpenPonk-Core/OPNote.class.st
+++ b/repository/OpenPonk-Core/OPNote.class.st
@@ -1,6 +1,8 @@
 Class {
 	#name : 'OPNote',
 	#superclass : 'OPDiagramOnlyShapeWithText',
+	#traits : 'OPTColoredAsFillAndBorderColoredAsStroke',
+	#classTraits : 'OPTColoredAsFillAndBorderColoredAsStroke classTrait',
 	#instVars : [
 		'text',
 		'topLeftBox',
@@ -29,9 +31,9 @@ OPNote class >> stonAllInstVarNames [
 ]
 
 { #category : 'accessing' }
-OPNote >> attachedShapes [
+OPNote >> attachedElementShapes [
 
-	^ super attachedShapes , {
+	^ {
 		  topLeftBox.
 		  upperTopRightBox.
 		  lowerTopRightBox.
@@ -41,7 +43,13 @@ OPNote >> attachedShapes [
 		  middleBottomBox.
 		  leftFillBox.
 		  bottomFillBox.
-		  triangle } , lines
+		  triangle }
+]
+
+{ #category : 'accessing' }
+OPNote >> attachedShapes [
+
+	^ super attachedShapes , self attachedElementShapes , lines
 ]
 
 { #category : 'creating - subelements' }
@@ -49,11 +57,9 @@ OPNote >> createOwnedBorderLines [
 
 	| lineShape innerLineShape |
 	lineShape := RSLine new
-		             color: Color darkGray;
 		             width: 1;
 		             yourself.
 	innerLineShape := RSLine new
-		                  color: Color gray;
 		                  width: 1;
 		                  yourself.
 	lines := {
@@ -72,7 +78,7 @@ OPNote >> createOwnedBorderLines [
 		         (lineShape copy
 			          from: topLeftBox;
 			          to: upperTopRightBox) } asGroup.
-	roassalShape canvas addAll: lines.
+	roassalShape canvas addAll: lines
 ]
 
 { #category : 'creating - subelements' }
@@ -80,8 +86,6 @@ OPNote >> createOwnedCornerTriangle [
 
 	triangle := RSSVGPath new
 		            svgPath: 'M0,0L20,0L0,-20Z';
-		            color: Color lightYellow darker;
-		            borderColor: Color lightGray;
 		            model: self;
 		            yourself.
 	self canvas add: triangle
@@ -92,7 +96,6 @@ OPNote >> createOwnedFillBoxes [
 
 	| fillBoxShape |
 	fillBoxShape := RSBox new
-		                color: Color lightYellow;
 		                borderColor: Color transparent;
 		                yourself.
 	leftFillBox := fillBoxShape model: #left.
@@ -107,7 +110,6 @@ OPNote >> createOwnedInvisibleBoxes [
 
 	| invisibleBoxShape invisibleBoxes |
 	invisibleBoxShape := RSBox new
-		                     color: Color transparent;
 		                     borderColor: Color transparent;
 		                     width: 1;
 		                     height: 1;
@@ -130,6 +132,12 @@ OPNote >> createOwnedInvisibleBoxes [
 	self canvas addAll: invisibleBoxes
 ]
 
+{ #category : 'accessing' }
+OPNote >> defaultFillColor [
+
+	^ OPDiagramFigureYellowFillColorCommand new color
+]
+
 { #category : 'initialization' }
 OPNote >> initialize [
 
@@ -259,3 +267,18 @@ OPNote >> updateOwnedElements [
 		extent: roassalShape extent + (0 @ -20);
 		translateTo: roassalShape position + (0 @ 10)
 ]
+
+{ #category : 'initialization' }
+OPNote >> updateRoassalShapeBorderColorFromStyles [
+
+	lines do: [ :each | each color: self borderColor ].
+	triangle borderColor:
+		(self borderColor alphaMixed: 0.35 with: Color white)
+]
+
+{ #category : 'initialization' }
+OPNote >> updateRoassalShapeColorFromStyles [
+
+	self attachedElementShapes do: [ :each | each color: self color ].
+	triangle color: self color slightlyDarker
+]
diff --git a/repository/OpenPonk-Core/OPShapeStyle.class.st b/repository/OpenPonk-Core/OPShapeStyle.class.st
index d33f649f..5dc2486b 100644
--- a/repository/OpenPonk-Core/OPShapeStyle.class.st
+++ b/repository/OpenPonk-Core/OPShapeStyle.class.st
@@ -78,6 +78,15 @@ OPShapeStyle >> removeKey: aSymbol [
 	^ result
 ]
 
+{ #category : 'removing' }
+OPShapeStyle >> removeKey: aSymbol ifAbsent: aBlock [
+
+	| result |
+	result := properties removeKey: aSymbol ifAbsent: [ ^ aBlock value ].
+	self styledElements do: #styleChanged.
+	^ result
+]
+
 { #category : 'accessing' }
 OPShapeStyle >> removedFromStyledElement: aDiagramElement [
 
diff --git a/repository/OpenPonk-Core/OPTBorderColoredAsStroke.trait.st b/repository/OpenPonk-Core/OPTBorderColoredAsStroke.trait.st
index 5885680d..48e6033d 100644
--- a/repository/OpenPonk-Core/OPTBorderColoredAsStroke.trait.st
+++ b/repository/OpenPonk-Core/OPTBorderColoredAsStroke.trait.st
@@ -11,10 +11,18 @@ OPTBorderColoredAsStroke >> borderColor [
 	^ self strokeColor
 ]
 
+{ #category : 'accessing' }
+OPTBorderColoredAsStroke >> defaultStrokeColor [
+
+	^ Color black
+]
+
 { #category : 'accessing' }
 OPTBorderColoredAsStroke >> strokeColor [
 
-	^ self stylePropertyNamed: #strokeColor ifAbsent: [ Color black ]
+	^ self
+		  stylePropertyNamed: #strokeColor
+		  ifAbsent: [ self defaultStrokeColor ]
 ]
 
 { #category : 'accessing' }
@@ -36,7 +44,7 @@ OPTBorderColoredAsStroke >> updateBorderColorFromStyles [
 				ifPresent: [ :previousBorder |
 					previousBorder do: [ :each | each color: self borderColor ].
 					^ self ] ].
-	self roassalShape borderColor: self borderColor
+	self updateRoassalShapeBorderColorFromStyles
 ]
 
 { #category : 'accessing' }
@@ -47,3 +55,9 @@ OPTBorderColoredAsStroke >> updateRenderFromStyles [
 	super updateRenderFromStyles.
 	self roassalShape signalUpdate
 ]
+
+{ #category : 'initialization' }
+OPTBorderColoredAsStroke >> updateRoassalShapeBorderColorFromStyles [
+
+	self roassalShape borderColor: self borderColor
+]
diff --git a/repository/OpenPonk-Core/OPTColored.trait.st b/repository/OpenPonk-Core/OPTColored.trait.st
index 1221dbed..ee4a39c6 100644
--- a/repository/OpenPonk-Core/OPTColored.trait.st
+++ b/repository/OpenPonk-Core/OPTColored.trait.st
@@ -24,7 +24,7 @@ OPTColored >> updateColorFromStyles [
 					at: key
 					put: (OrderedCollection with: self color).
 				^ self ] ].
-	self roassalShape color: self color
+	self updateRoassalShapeColorFromStyles
 ]
 
 { #category : 'initialization' }
@@ -35,3 +35,9 @@ OPTColored >> updateRenderFromStyles [
 	super updateRenderFromStyles.
 	self roassalShape signalUpdate
 ]
+
+{ #category : 'initialization' }
+OPTColored >> updateRoassalShapeColorFromStyles [
+
+	self roassalShape color: self color
+]
diff --git a/repository/OpenPonk-Core/OPTColoredAsFill.trait.st b/repository/OpenPonk-Core/OPTColoredAsFill.trait.st
index 591a7b3a..3d192696 100644
--- a/repository/OpenPonk-Core/OPTColoredAsFill.trait.st
+++ b/repository/OpenPonk-Core/OPTColoredAsFill.trait.st
@@ -13,10 +13,18 @@ OPTColoredAsFill >> color [
 	^ self fillColor
 ]
 
+{ #category : 'accessing' }
+OPTColoredAsFill >> defaultFillColor [
+
+	^ Color white
+]
+
 { #category : 'accessing' }
 OPTColoredAsFill >> fillColor [
 
-	^ self stylePropertyNamed: #fillColor ifAbsent: [ Color white ]
+	^ self
+		  stylePropertyNamed: #fillColor
+		  ifAbsent: [ self defaultFillColor ]
 ]
 
 { #category : 'accessing' }
diff --git a/repository/OpenPonk-Core/OPTColoredAsFont.trait.st b/repository/OpenPonk-Core/OPTColoredAsFont.trait.st
index 2796722c..02387566 100644
--- a/repository/OpenPonk-Core/OPTColoredAsFont.trait.st
+++ b/repository/OpenPonk-Core/OPTColoredAsFont.trait.st
@@ -13,10 +13,18 @@ OPTColoredAsFont >> color [
 	^ self fontColor
 ]
 
+{ #category : 'accessing' }
+OPTColoredAsFont >> defaultFontColor [
+
+	^ Color black
+]
+
 { #category : 'accessing' }
 OPTColoredAsFont >> fontColor [
 
-	^ self stylePropertyNamed: #fontColor ifAbsent: [ Color black ]
+	^ self
+		  stylePropertyNamed: #fontColor
+		  ifAbsent: [ self defaultFontColor ]
 ]
 
 { #category : 'accessing' }
diff --git a/repository/OpenPonk-Core/OPTColoredAsStroke.trait.st b/repository/OpenPonk-Core/OPTColoredAsStroke.trait.st
index e0f1aac7..dd989752 100644
--- a/repository/OpenPonk-Core/OPTColoredAsStroke.trait.st
+++ b/repository/OpenPonk-Core/OPTColoredAsStroke.trait.st
@@ -13,10 +13,18 @@ OPTColoredAsStroke >> color [
 	^ self strokeColor
 ]
 
+{ #category : 'accessing' }
+OPTColoredAsStroke >> defaultStrokeColor [
+
+	^ Color black
+]
+
 { #category : 'accessing' }
 OPTColoredAsStroke >> strokeColor [
 
-	^ self stylePropertyNamed: #strokeColor ifAbsent: [ Color black ]
+	^ self
+		  stylePropertyNamed: #strokeColor
+		  ifAbsent: [ self defaultStrokeColor ]
 ]
 
 { #category : 'accessing' }
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureBlackFontColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureBlackFontColorCommand.class.st
index f51cb79c..990af629 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureBlackFontColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureBlackFontColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureBlackFontColorCommand >> color [
+OPDiagramFigureBlackFontColorCommand class >> color [
 
 	^ Color black
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureBlackFontColorCommand >> defaultMenuItemName [
-
-	^ 'Black'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureBlackStrokeColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureBlackStrokeColorCommand.class.st
index 5ff07cc5..6ac602f3 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureBlackStrokeColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureBlackStrokeColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureBlackStrokeColorCommand >> color [
+OPDiagramFigureBlackStrokeColorCommand class >> color [
 
 	^ Color black
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureBlackStrokeColorCommand >> defaultMenuItemName [
-
-	^ 'Black'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureBlueFillColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureBlueFillColorCommand.class.st
index 33669a54..d890e555 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureBlueFillColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureBlueFillColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureBlueFillColorCommand >> color [
+OPDiagramFigureBlueFillColorCommand class >> color [
 
 	^ Color paleBlue
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureBlueFillColorCommand >> defaultMenuItemName [
-
-	^ 'Blue'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureBlueFontColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureBlueFontColorCommand.class.st
index ed2c5a1b..e0740bd6 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureBlueFontColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureBlueFontColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureBlueFontColorCommand >> color [
+OPDiagramFigureBlueFontColorCommand class >> color [
 
 	^ Color blue
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureBlueFontColorCommand >> defaultMenuItemName [
-
-	^ 'Blue'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureBlueStrokeColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureBlueStrokeColorCommand.class.st
index 7b22f2e1..080cfe2b 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureBlueStrokeColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureBlueStrokeColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureBlueStrokeColorCommand >> color [
+OPDiagramFigureBlueStrokeColorCommand class >> color [
 
 	^ Color blue
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureBlueStrokeColorCommand >> defaultMenuItemName [
-
-	^ 'Blue'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureColorCommand.class.st
index 2dcd9aaf..33caea02 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureColorCommand.class.st
@@ -1,15 +1,12 @@
 Class {
 	#name : 'OPDiagramFigureColorCommand',
 	#superclass : 'OPDiagramFigureCommand',
-	#instVars : [
-		'niceColorName'
-	],
 	#category : 'OpenPonk-Spec-Diagram-Figure-Commands',
 	#package : 'OpenPonk-Spec',
 	#tag : 'Diagram-Figure-Commands'
 }
 
-{ #category : 'as yet unclassified' }
+{ #category : 'testing' }
 OPDiagramFigureColorCommand class >> canBeExecutedInContext: aToolContext [
 
 	^ (super canBeExecutedInContext: aToolContext) and: [
@@ -17,12 +14,47 @@ OPDiagramFigureColorCommand class >> canBeExecutedInContext: aToolContext [
 			  any diagramElement supportsColorChangeOfType: self colorAttribute ] ]
 ]
 
+{ #category : 'accessing' }
+OPDiagramFigureColorCommand class >> color [
+
+	^ self subclassResponsibility
+]
+
 { #category : 'accessing' }
 OPDiagramFigureColorCommand class >> colorAttribute [
 
 	^ self subclassResponsibility
 ]
 
+{ #category : 'accessing' }
+OPDiagramFigureColorCommand class >> colorFor: aDiagramElement [
+
+	^ self color
+]
+
+{ #category : 'accessing' }
+OPDiagramFigureColorCommand class >> currentColorOf: aDiagramElement [
+
+	^ aDiagramElement
+		  stylePropertyNamed: self colorAttribute
+		  ifAbsent: [ self defaultColorOf: aDiagramElement ]
+]
+
+{ #category : 'accessing' }
+OPDiagramFigureColorCommand class >> defaultColorOf: aDiagramElement [
+
+	^ self subclassResponsibility
+]
+
+{ #category : 'accessing' }
+OPDiagramFigureColorCommand class >> defaultColorsOfDiagramElements: diagramElements [
+
+	^ (diagramElements select: [ :each |
+		   each supportsColorChangeOfType: self colorAttribute ])
+		  collect: [ :each | self defaultColorOf: each ]
+		  as: Set
+]
+
 { #category : 'testing' }
 OPDiagramFigureColorCommand class >> isAbstract [
 
@@ -33,32 +65,69 @@ OPDiagramFigureColorCommand class >> isAbstract [
 { #category : 'accessing' }
 OPDiagramFigureColorCommand >> color [
 
-	^ self subclassResponsibility
+	^ self class color
 ]
 
 { #category : 'accessing' }
-OPDiagramFigureColorCommand >> colorAttribute [
-	^ self class colorAttribute
+OPDiagramFigureColorCommand >> colorName [
+
+	| colorName |
+	colorName := self color name.
+	colorName = #unnamed ifTrue: [ ^ '#' , self color asHexString ].
+	^ colorName splitCamelCase last capitalized
+]
+
+{ #category : 'accessing - defaults' }
+OPDiagramFigureColorCommand >> currentColors [
+
+	^ (diagramElements select: [ :each |
+		   each supportsColorChangeOfType: self class colorAttribute ])
+		  collect: [ :each | self class currentColorOf: each ]
+		  as: Set
+]
+
+{ #category : 'accessing - defaults' }
+OPDiagramFigureColorCommand >> defaultColors [
+
+	^ self class defaultColorsOfDiagramElements: diagramElements
 ]
 
 { #category : 'accessing' }
-OPDiagramFigureColorCommand >> defaultMenuIcon [
+OPDiagramFigureColorCommand >> defaultMenuIconFormSet [
 
-	^ Morph new 
-				color: self color;
-				asFormOfSize: 30@20
+	^ FormSet form: (Morph new
+			   color: self color;
+			   asFormOfSize: 30 @ 20)
 ]
 
 { #category : 'accessing' }
 OPDiagramFigureColorCommand >> defaultMenuItemName [
 
-	^ self subclassResponsibility
+	| isDefault isCurrent |
+	isDefault := self defaultColors allSatisfy: [ :each |
+		             each = self color ].
+	isCurrent := self currentColors allSatisfy: [ :each |
+		             each = self color ].
+	^ String streamContents: [ :s |
+		  s << self colorName.
+		  isDefault ifTrue: [ s << ' (default)' ].
+		  isCurrent ifTrue: [ s << ' [current]' ] ]
 ]
 
-{ #category : 'accessing' }
+{ #category : 'execution' }
 OPDiagramFigureColorCommand >> execute [
 
-	controllers collect: #diagramElement thenDo: [ :each |
-		(each supportsColorChangeOfType: self colorAttribute) ifTrue: [
-			each stylePropertyNamed: self colorAttribute put: self color ] ]
+	diagramElements
+		select: [ :each |
+		each supportsColorChangeOfType: self class colorAttribute ]
+		thenDo: [ :each |
+			self executeOn: each ]
+]
+
+{ #category : 'execution' }
+OPDiagramFigureColorCommand >> executeOn: aDiagramElement [
+
+	aDiagramElement
+		stylePropertyNamed: self class colorAttribute
+		put: (self class colorFor: aDiagramElement)
 ]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureCommand.class.st
index 0bab5237..6bae6b1f 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureCommand.class.st
@@ -52,13 +52,14 @@ OPDiagramFigureCommand class >> isAbstract [
 ]
 
 { #category : 'execution' }
-OPDiagramFigureCommand >> prepareFullExecutionInContext: aToolContext [
+OPDiagramFigureCommand >> readParametersFromContext: aToolContext [
+
+	super readParametersFromContext: aToolContext.
 
-	super prepareFullExecutionInContext: aToolContext.
 	diagramController := aToolContext diagramController.
 	canvas := diagramController canvas.
 	figures := aToolContext figures.
 	models := aToolContext models.
 	controllers := aToolContext controllers.
-	diagramElements := aToolContext diagramElements.
+	diagramElements := aToolContext diagramElements
 ]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureDefaultFillColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureDefaultFillColorCommand.class.st
new file mode 100644
index 00000000..8662e843
--- /dev/null
+++ b/repository/OpenPonk-Spec/OPDiagramFigureDefaultFillColorCommand.class.st
@@ -0,0 +1,15 @@
+Class {
+	#name : 'OPDiagramFigureDefaultFillColorCommand',
+	#superclass : 'OPDiagramFigureFillColorCommand',
+	#traits : 'OPTDiagramFigureDefaultColorCommand',
+	#classTraits : 'OPTDiagramFigureDefaultColorCommand classTrait',
+	#category : 'OpenPonk-Spec-Diagram-Figure-Commands',
+	#package : 'OpenPonk-Spec',
+	#tag : 'Diagram-Figure-Commands'
+}
+
+{ #category : 'accessing' }
+OPDiagramFigureDefaultFillColorCommand >> defaultMenuItemName [
+
+	^ self colorName
+]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureDefaultFontColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureDefaultFontColorCommand.class.st
new file mode 100644
index 00000000..c1d444ef
--- /dev/null
+++ b/repository/OpenPonk-Spec/OPDiagramFigureDefaultFontColorCommand.class.st
@@ -0,0 +1,9 @@
+Class {
+	#name : 'OPDiagramFigureDefaultFontColorCommand',
+	#superclass : 'OPDiagramFigureFontColorCommand',
+	#traits : 'OPTDiagramFigureDefaultColorCommand',
+	#classTraits : 'OPTDiagramFigureDefaultColorCommand classTrait',
+	#category : 'OpenPonk-Spec-Diagram-Figure-Commands',
+	#package : 'OpenPonk-Spec',
+	#tag : 'Diagram-Figure-Commands'
+}
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureDefaultStrokeColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureDefaultStrokeColorCommand.class.st
new file mode 100644
index 00000000..9a915065
--- /dev/null
+++ b/repository/OpenPonk-Spec/OPDiagramFigureDefaultStrokeColorCommand.class.st
@@ -0,0 +1,9 @@
+Class {
+	#name : 'OPDiagramFigureDefaultStrokeColorCommand',
+	#superclass : 'OPDiagramFigureStrokeColorCommand',
+	#traits : 'OPTDiagramFigureDefaultColorCommand',
+	#classTraits : 'OPTDiagramFigureDefaultColorCommand classTrait',
+	#category : 'OpenPonk-Spec-Diagram-Figure-Commands',
+	#package : 'OpenPonk-Spec',
+	#tag : 'Diagram-Figure-Commands'
+}
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureFillColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureFillColorCommand.class.st
index 8ab1d012..171e3e91 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureFillColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureFillColorCommand.class.st
@@ -20,3 +20,9 @@ OPDiagramFigureFillColorCommand class >> contextMenuActivation [
 		  byItemOf: OPFigureFillColorMenuGroup
 		  for: OPCanvasPresenter
 ]
+
+{ #category : 'as yet unclassified' }
+OPDiagramFigureFillColorCommand class >> defaultColorOf: aDiagramElement [
+
+	^ aDiagramElement defaultFillColor
+]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureFontColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureFontColorCommand.class.st
index df7fdaa7..2bf6594b 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureFontColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureFontColorCommand.class.st
@@ -20,3 +20,9 @@ OPDiagramFigureFontColorCommand class >> contextMenuActivation [
 		  byItemOf: OPFigureFontColorMenuGroup
 		  for: OPCanvasPresenter
 ]
+
+{ #category : 'accessing' }
+OPDiagramFigureFontColorCommand class >> defaultColorOf: aDiagramElement [
+
+	^ aDiagramElement defaultFontColor
+]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureGrayFillColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureGrayFillColorCommand.class.st
index 5338a634..c353f410 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureGrayFillColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureGrayFillColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureGrayFillColorCommand >> color [
+OPDiagramFigureGrayFillColorCommand class >> color [
 
 	^ Color veryVeryLightGray
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureGrayFillColorCommand >> defaultMenuItemName [
-
-	^ 'Gray'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureGrayFontColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureGrayFontColorCommand.class.st
index 05d14b1a..6ecf7142 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureGrayFontColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureGrayFontColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureGrayFontColorCommand >> color [
+OPDiagramFigureGrayFontColorCommand class >> color [
 
 	^ Color lightGray
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureGrayFontColorCommand >> defaultMenuItemName [
-
-	^ 'Gray'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureGrayStrokeColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureGrayStrokeColorCommand.class.st
index afb87bfa..b422fc09 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureGrayStrokeColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureGrayStrokeColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureGrayStrokeColorCommand >> color [
+OPDiagramFigureGrayStrokeColorCommand class >> color [
 
 	^ Color lightGray
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureGrayStrokeColorCommand >> defaultMenuItemName [
-
-	^ 'Gray'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureGreenFillColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureGreenFillColorCommand.class.st
index 164d5107..f86ca263 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureGreenFillColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureGreenFillColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureGreenFillColorCommand >> color [
+OPDiagramFigureGreenFillColorCommand class >> color [
 
 	^ Color paleGreen
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureGreenFillColorCommand >> defaultMenuItemName [
-
-	^ 'Green'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureGreenFontColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureGreenFontColorCommand.class.st
index 7c60cbba..d7a4d9c0 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureGreenFontColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureGreenFontColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureGreenFontColorCommand >> color [
+OPDiagramFigureGreenFontColorCommand class >> color [
 
 	^ Color green
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureGreenFontColorCommand >> defaultMenuItemName [
-
-	^ 'Green'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureGreenStrokeColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureGreenStrokeColorCommand.class.st
index db637d01..1584bbc0 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureGreenStrokeColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureGreenStrokeColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureGreenStrokeColorCommand >> color [
+OPDiagramFigureGreenStrokeColorCommand class >> color [
 
 	^ Color green
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureGreenStrokeColorCommand >> defaultMenuItemName [
-
-	^ 'Green'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureMagentaFillColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureMagentaFillColorCommand.class.st
index 5cfa1cde..cd2fe397 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureMagentaFillColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureMagentaFillColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureMagentaFillColorCommand >> color [
+OPDiagramFigureMagentaFillColorCommand class >> color [
 
 	^ Color paleMagenta
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureMagentaFillColorCommand >> defaultMenuItemName [
-
-	^ 'Magenta'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureMagentaFontColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureMagentaFontColorCommand.class.st
index ebdc485f..5d8d3ca9 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureMagentaFontColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureMagentaFontColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureMagentaFontColorCommand >> color [
+OPDiagramFigureMagentaFontColorCommand class >> color [
 
 	^ Color magenta
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureMagentaFontColorCommand >> defaultMenuItemName [
-
-	^ 'Magenta'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureMagentaStrokeColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureMagentaStrokeColorCommand.class.st
index 55e1026f..7a8a6fe0 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureMagentaStrokeColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureMagentaStrokeColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureMagentaStrokeColorCommand >> color [
+OPDiagramFigureMagentaStrokeColorCommand class >> color [
 
 	^ Color magenta
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureMagentaStrokeColorCommand >> defaultMenuItemName [
-
-	^ 'Magenta'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureOrangeFillColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureOrangeFillColorCommand.class.st
index 2d6394e0..e03c8939 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureOrangeFillColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureOrangeFillColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureOrangeFillColorCommand >> color [
+OPDiagramFigureOrangeFillColorCommand class >> color [
 
 	^ Color paleOrange
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureOrangeFillColorCommand >> defaultMenuItemName [
-
-	^ 'Orange'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureOrangeFontColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureOrangeFontColorCommand.class.st
index bcf68842..896d572d 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureOrangeFontColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureOrangeFontColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureOrangeFontColorCommand >> color [
+OPDiagramFigureOrangeFontColorCommand class >> color [
 
 	^ Color orange
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureOrangeFontColorCommand >> defaultMenuItemName [
-
-	^ 'Orange'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureOrangeStrokeColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureOrangeStrokeColorCommand.class.st
index 889c9fa3..87722f87 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureOrangeStrokeColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureOrangeStrokeColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureOrangeStrokeColorCommand >> color [
+OPDiagramFigureOrangeStrokeColorCommand class >> color [
 
 	^ Color orange
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureOrangeStrokeColorCommand >> defaultMenuItemName [
-
-	^ 'Orange'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureRedFillColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureRedFillColorCommand.class.st
index 0db516f2..abced8ee 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureRedFillColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureRedFillColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureRedFillColorCommand >> color [
+OPDiagramFigureRedFillColorCommand class >> color [
 
 	^ Color paleRed
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureRedFillColorCommand >> defaultMenuItemName [
-
-	^ 'Red'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureRedFontColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureRedFontColorCommand.class.st
index eaecd794..d95f46c1 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureRedFontColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureRedFontColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureRedFontColorCommand >> color [
+OPDiagramFigureRedFontColorCommand class >> color [
 
 	^ Color red
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureRedFontColorCommand >> defaultMenuItemName [
-
-	^ 'Red'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureRedStrokeColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureRedStrokeColorCommand.class.st
index eee33719..260bf145 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureRedStrokeColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureRedStrokeColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureRedStrokeColorCommand >> color [
+OPDiagramFigureRedStrokeColorCommand class >> color [
 
 	^ Color red
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureRedStrokeColorCommand >> defaultMenuItemName [
-
-	^ 'Red'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureStrokeColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureStrokeColorCommand.class.st
index 62d3374e..d7e0d33a 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureStrokeColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureStrokeColorCommand.class.st
@@ -20,3 +20,9 @@ OPDiagramFigureStrokeColorCommand class >> contextMenuActivation [
 		  byItemOf: OPFigureStrokeColorMenuGroup
 		  for: OPCanvasPresenter
 ]
+
+{ #category : 'as yet unclassified' }
+OPDiagramFigureStrokeColorCommand class >> defaultColorOf: aDiagramElement [
+
+	^ aDiagramElement defaultStrokeColor
+]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureTransparentFillColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureTransparentFillColorCommand.class.st
index d3cad701..4ac87060 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureTransparentFillColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureTransparentFillColorCommand.class.st
@@ -7,21 +7,13 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureTransparentFillColorCommand >> color [
+OPDiagramFigureTransparentFillColorCommand class >> color [
 
 	^ Color transparent
 ]
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureTransparentFillColorCommand >> defaultMenuIcon [
+OPDiagramFigureTransparentFillColorCommand >> defaultMenuIconFormSet [
 
-	^ Morph new 
-				color: Color white;
-				asFormOfSize: 30@20
-]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureTransparentFillColorCommand >> defaultMenuItemName [
-
-	^ 'Transparent'
+	^ nil
 ]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureWhiteFillColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureWhiteFillColorCommand.class.st
index 83ceab34..12c79a93 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureWhiteFillColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureWhiteFillColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureWhiteFillColorCommand >> color [
+OPDiagramFigureWhiteFillColorCommand class >> color [
 
 	^ Color white
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureWhiteFillColorCommand >> defaultMenuItemName [
-
-	^ 'White'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureWhiteFontColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureWhiteFontColorCommand.class.st
index 6bccb5bf..8cc8f6f3 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureWhiteFontColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureWhiteFontColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureWhiteFontColorCommand >> color [
+OPDiagramFigureWhiteFontColorCommand class >> color [
 
 	^ Color white
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureWhiteFontColorCommand >> defaultMenuItemName [
-
-	^ 'White'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureWhiteStrokeColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureWhiteStrokeColorCommand.class.st
index cfaf3151..8607c2a5 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureWhiteStrokeColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureWhiteStrokeColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureWhiteStrokeColorCommand >> color [
+OPDiagramFigureWhiteStrokeColorCommand class >> color [
 
 	^ Color white
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureWhiteStrokeColorCommand >> defaultMenuItemName [
-
-	^ 'White'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureYellowFillColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureYellowFillColorCommand.class.st
index dcd1b894..0c905cd9 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureYellowFillColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureYellowFillColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureYellowFillColorCommand >> color [
+OPDiagramFigureYellowFillColorCommand class >> color [
 
 	^ Color paleYellow
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureYellowFillColorCommand >> defaultMenuItemName [
-
-	^ 'Yellow'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureYellowFontColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureYellowFontColorCommand.class.st
index 4a150063..a9b0db7b 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureYellowFontColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureYellowFontColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureYellowFontColorCommand >> color [
+OPDiagramFigureYellowFontColorCommand class >> color [
 
 	^ Color yellow
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureYellowFontColorCommand >> defaultMenuItemName [
-
-	^ 'Yellow'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureYellowStrokeColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureYellowStrokeColorCommand.class.st
index a4c65429..3004c5e2 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureYellowStrokeColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureYellowStrokeColorCommand.class.st
@@ -7,13 +7,7 @@ Class {
 }
 
 { #category : 'as yet unclassified' }
-OPDiagramFigureYellowStrokeColorCommand >> color [
+OPDiagramFigureYellowStrokeColorCommand class >> color [
 
 	^ Color yellow
 ]
-
-{ #category : 'as yet unclassified' }
-OPDiagramFigureYellowStrokeColorCommand >> defaultMenuItemName [
-
-	^ 'Yellow'
-]
diff --git a/repository/OpenPonk-Spec/OPDiagramInspectControllerFigureCommand.class.st b/repository/OpenPonk-Spec/OPDiagramInspectControllerFigureCommand.class.st
index cc97db07..b002c941 100644
--- a/repository/OpenPonk-Spec/OPDiagramInspectControllerFigureCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramInspectControllerFigureCommand.class.st
@@ -24,7 +24,8 @@ OPDiagramInspectControllerFigureCommand >> defaultMenuItemName [
 	| basicName |
 	basicName := 'Inspect controller'.
 	controllers ifNil: [ ^ basicName ].
-	^ controllers size pluralize: basicName
+	controllers size = 1 ifTrue: [ ^ basicName ].
+	^ GRInflector pluralize: basicName
 ]
 
 { #category : 'execution' }
diff --git a/repository/OpenPonk-Spec/OPDiagramInspectDiagramElementCommand.class.st b/repository/OpenPonk-Spec/OPDiagramInspectDiagramElementCommand.class.st
index f9eee93a..b4113383 100644
--- a/repository/OpenPonk-Spec/OPDiagramInspectDiagramElementCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramInspectDiagramElementCommand.class.st
@@ -17,8 +17,9 @@ OPDiagramInspectDiagramElementCommand >> defaultMenuItemName [
 
 	| basicName |
 	basicName := 'Inspect diagram element'.
-	figures ifNil: [ ^ basicName ].
-	^ figures size pluralize: basicName
+	diagramElements ifNil: [ ^ basicName ].
+	diagramElements size = 1 ifTrue: [ ^ basicName ].
+	^ GRInflector pluralize: basicName
 ]
 
 { #category : 'execution' }
diff --git a/repository/OpenPonk-Spec/OPDiagramInspectFigureCommand.class.st b/repository/OpenPonk-Spec/OPDiagramInspectFigureCommand.class.st
index be583d3b..511a86ea 100644
--- a/repository/OpenPonk-Spec/OPDiagramInspectFigureCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramInspectFigureCommand.class.st
@@ -18,7 +18,8 @@ OPDiagramInspectFigureCommand >> defaultMenuItemName [
 	| basicName |
 	basicName := 'Inspect figure'.
 	figures ifNil: [ ^ basicName ].
-	^ figures size pluralize: basicName
+	figures size = 1 ifTrue: [ ^ basicName ].
+	^ GRInflector pluralize: basicName
 ]
 
 { #category : 'execution' }
diff --git a/repository/OpenPonk-Spec/OPDiagramInspectModelFigureCommand.class.st b/repository/OpenPonk-Spec/OPDiagramInspectModelFigureCommand.class.st
index d9c69c91..4041d3da 100644
--- a/repository/OpenPonk-Spec/OPDiagramInspectModelFigureCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramInspectModelFigureCommand.class.st
@@ -18,13 +18,14 @@ OPDiagramInspectModelFigureCommand >> defaultMenuIcon [
 	^ self iconNamed: #glamorousInspect
 ]
 
-{ #category : 'execution' }
+{ #category : 'accessing' }
 OPDiagramInspectModelFigureCommand >> defaultMenuItemName [
 
 	| basicName |
 	basicName := 'Inspect model'.
 	models ifNil: [ ^ basicName ].
-	^ models size pluralize: basicName
+	models size = 1 ifTrue: [ ^ basicName ].
+	^ GRInflector pluralize: basicName
 ]
 
 { #category : 'execution' }
diff --git a/repository/OpenPonk-Spec/OPDiagramToolbarCommand.class.st b/repository/OpenPonk-Spec/OPDiagramToolbarCommand.class.st
index f0ec21d1..05b48b09 100644
--- a/repository/OpenPonk-Spec/OPDiagramToolbarCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramToolbarCommand.class.st
@@ -17,7 +17,7 @@ OPDiagramToolbarCommand class >> defaultMenuItemName [
 	| parts |
 	true
 		ifTrue: [ ^ 'TESTTEST' ].
-	parts := self name splitOnCapitals allButLast: 2.
+	parts := self name splitCamelCase allButLast: 2.
 	parts ifEmpty: [ ^ self name ].
 	^ String
 		streamContents: [ :s | 
diff --git a/repository/OpenPonk-Spec/OPEdgeCreationTargetController.class.st b/repository/OpenPonk-Spec/OPEdgeCreationTargetController.class.st
index 5ba9b406..22663cc4 100644
--- a/repository/OpenPonk-Spec/OPEdgeCreationTargetController.class.st
+++ b/repository/OpenPonk-Spec/OPEdgeCreationTargetController.class.st
@@ -5,8 +5,9 @@ Class {
 		'edgeController',
 		'diagramElement'
 	],
-	#category : 'OpenPonk-Spec',
-	#package : 'OpenPonk-Spec'
+	#category : 'OpenPonk-Spec-Palettes',
+	#package : 'OpenPonk-Spec',
+	#tag : 'Palettes'
 }
 
 { #category : 'rendering' }
diff --git a/repository/OpenPonk-Spec/OPFigureColorMenuGroup.class.st b/repository/OpenPonk-Spec/OPFigureColorMenuGroup.class.st
index ef6af32e..bd575904 100644
--- a/repository/OpenPonk-Spec/OPFigureColorMenuGroup.class.st
+++ b/repository/OpenPonk-Spec/OPFigureColorMenuGroup.class.st
@@ -30,7 +30,7 @@ OPFigureColorMenuGroup class >> generateColorCommands [
 	self colors do: [ :each |
 		| colorName niceColorName className class |
 		colorName := each name.
-		niceColorName := each name capitalized splitOnCapitals last.
+		niceColorName := each name capitalized splitCamelCase last.
 		className := ('OPDiagramFigure' , niceColorName , niceAttributeName
 		              , 'Command') asSymbol.
 
diff --git a/repository/OpenPonk-Spec/OPTDiagramFigureDefaultColorCommand.trait.st b/repository/OpenPonk-Spec/OPTDiagramFigureDefaultColorCommand.trait.st
new file mode 100644
index 00000000..0beaa531
--- /dev/null
+++ b/repository/OpenPonk-Spec/OPTDiagramFigureDefaultColorCommand.trait.st
@@ -0,0 +1,45 @@
+Trait {
+	#name : 'OPTDiagramFigureDefaultColorCommand',
+	#category : 'OpenPonk-Spec-Diagram-Figure-Commands',
+	#package : 'OpenPonk-Spec',
+	#tag : 'Diagram-Figure-Commands'
+}
+
+{ #category : 'testing' }
+OPTDiagramFigureDefaultColorCommand classSide >> canBeExecutedInContext: aToolContext [
+
+	| defaultColors |
+	(super canBeExecutedInContext: aToolContext) ifFalse: [ ^ false ].
+	defaultColors := self defaultColorsOfDiagramElements:
+		                 aToolContext diagramElements.
+	^ defaultColors size > 1 or: [
+		  self superclass allSubclasses noneSatisfy: [ :each |
+			  each color = defaultColors anyOne ] ]
+]
+
+{ #category : 'accessing' }
+OPTDiagramFigureDefaultColorCommand classSide >> color [
+
+	^ Color transparent
+]
+
+{ #category : 'accessing' }
+OPTDiagramFigureDefaultColorCommand classSide >> colorFor: aDiagramElement [
+
+	^ self defaultColorOf: aDiagramElement
+]
+
+{ #category : 'accessing' }
+OPTDiagramFigureDefaultColorCommand >> color [
+
+	| defaultColors |
+	defaultColors := self defaultColors.
+	defaultColors size = 1 ifFalse: [ ^ self class color ].
+	^ defaultColors anyOne
+]
+
+{ #category : 'execution' }
+OPTDiagramFigureDefaultColorCommand >> executeOn: aDiagramElement [
+
+	aDiagramElement removeStylePropertyNamed: self class colorAttribute
+]
diff --git a/repository/OpenPonk-Spec/OPToggleFigureCommand.class.st b/repository/OpenPonk-Spec/OPToggleFigureCommand.class.st
index 242cb1af..e6f8c7d1 100644
--- a/repository/OpenPonk-Spec/OPToggleFigureCommand.class.st
+++ b/repository/OpenPonk-Spec/OPToggleFigureCommand.class.st
@@ -35,12 +35,9 @@ OPToggleFigureCommand >> basicExecute [
 { #category : 'accessing' }
 OPToggleFigureCommand >> defaultMenuItemName [
 
-	| basicName |
-	basicName := ((((self class name withoutPrefix: 'OP') withoutSuffix:
-		                'FigureCommand') splitOnCapitals collect:
-		               #asLowercase) joinUsing: ' ') capitalized.
-	models ifNil: [ ^ basicName ].
-	^ models size pluralize: basicName
+	^ ((((self class name withoutPrefix: 'OP') withoutSuffix:
+		     'FigureCommand') splitCamelCase collect: #asLowercase)
+		   joinUsing: ' ') capitalized
 ]
 
 { #category : 'execution' }
diff --git a/repository/OpenPonk-Spec/String.extension.st b/repository/OpenPonk-Spec/String.extension.st
deleted file mode 100644
index 5224bf25..00000000
--- a/repository/OpenPonk-Spec/String.extension.st
+++ /dev/null
@@ -1,6 +0,0 @@
-Extension { #name : 'String' }
-
-{ #category : '*OpenPonk-Spec' }
-String >> splitOnCapitals [
-	^ '[A-Z][^A-Z]+' asRegex matchesIn: self
-]