diff --git a/src/Pyramid-Bloc/PyramidAbstractBorderCommand.class.st b/src/Pyramid-Bloc/PyramidAbstractBorderCommand.class.st
index d95e683..d355e19 100644
--- a/src/Pyramid-Bloc/PyramidAbstractBorderCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidAbstractBorderCommand.class.st
@@ -20,7 +20,7 @@ PyramidAbstractBorderCommand >> borderBuilderOf: aBlElement [
 	^ builder
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidAbstractBorderCommand >> setValueFor: aBlElement with: anArgument [
 
 	| builder |
diff --git a/src/Pyramid-Bloc/PyramidAbstractChangeDrawOrderCommand.class.st b/src/Pyramid-Bloc/PyramidAbstractChangeDrawOrderCommand.class.st
index 38ee07c..a661632 100644
--- a/src/Pyramid-Bloc/PyramidAbstractChangeDrawOrderCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidAbstractChangeDrawOrderCommand.class.st
@@ -16,7 +16,7 @@ PyramidAbstractChangeDrawOrderCommand >> canBeUsedFor: anObject [
 	^ (super canBeUsedFor: anObject) and: [ anObject hasParent]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidAbstractChangeDrawOrderCommand >> getValueFor: aBlElement [
 	"return current index for testing."
 
diff --git a/src/Pyramid-Bloc/PyramidAddChildCommand.class.st b/src/Pyramid-Bloc/PyramidAddChildCommand.class.st
index 5b13af9..40ae11b 100644
--- a/src/Pyramid-Bloc/PyramidAddChildCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidAddChildCommand.class.st
@@ -4,14 +4,26 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidAddChildCommand >> commandInverse [
 
 	^ PyramidRemoveChildCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #private }
+PyramidAddChildCommand >> savedIndexFor: aChild in: aParent [
+
+	| index |
+	index := aChild userData at: #removedAtIndex ifAbsent: [ 0 ].
+	(index = 0 or: [ index > aParent children size ])
+		ifTrue: [ ^ aParent children size + 1 ]
+		ifFalse: [ ^ index ]
+]
+
+{ #category : #setter }
 PyramidAddChildCommand >> setValueFor: aBlElement with: aChildToAdd [
 
-	aBlElement addChild: aChildToAdd
+	aBlElement
+		addChild: aChildToAdd
+		at: (self savedIndexFor: aChildToAdd in: aBlElement)
 ]
diff --git a/src/Pyramid-Bloc/PyramidAddChildrenCommand.class.st b/src/Pyramid-Bloc/PyramidAddChildrenCommand.class.st
index 1c14656..d03a1e2 100644
--- a/src/Pyramid-Bloc/PyramidAddChildrenCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidAddChildrenCommand.class.st
@@ -4,14 +4,14 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidAddChildrenCommand >> commandInverse [
 
 	^ PyramidRemoveChildrenCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidAddChildrenCommand >> setValueFor: aBlElement with: aChildrenToAdd [
 
-	aBlElement addChildren: aChildrenToAdd
+    aBlElement addChildren: aChildrenToAdd 
 ]
diff --git a/src/Pyramid-Bloc/PyramidBackgroundImageCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundImageCommand.class.st
index e8d958a..42bda92 100644
--- a/src/Pyramid-Bloc/PyramidBackgroundImageCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBackgroundImageCommand.class.st
@@ -11,13 +11,13 @@ PyramidBackgroundImageCommand >> canBeUsedFor: anObject [
 		  anObject background isKindOf: BlImageBackground ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundImageCommand >> getValueFor: aBlElement [
 
 	^ aBlElement background image
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBackgroundImageCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement background: (BlBackground image: anArgument)
diff --git a/src/Pyramid-Bloc/PyramidBackgroundOpacityCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundOpacityCommand.class.st
index f5093b8..5521f47 100644
--- a/src/Pyramid-Bloc/PyramidBackgroundOpacityCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBackgroundOpacityCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundOpacityCommand >> getValueFor: aBlElement [
 
 	^ aBlElement background opacity
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBackgroundOpacityCommand >> setValueFor: aBlElement with: anArgument [
 
 	| background |
diff --git a/src/Pyramid-Bloc/PyramidBackgroundPaintColorCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundPaintColorCommand.class.st
index d2249ff..0a63dd0 100644
--- a/src/Pyramid-Bloc/PyramidBackgroundPaintColorCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBackgroundPaintColorCommand.class.st
@@ -12,13 +12,13 @@ PyramidBackgroundPaintColorCommand >> canBeUsedFor: anObject [
 			  anObject background paint isKindOf: BlColorPaint ] ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundPaintColorCommand >> getValueFor: aBlElement [
 
 	^ aBlElement background paint color
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBackgroundPaintColorCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement background: (BlBackground paint: anArgument asBlPaint)
diff --git a/src/Pyramid-Bloc/PyramidBackgroundPaintCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundPaintCommand.class.st
index 95c0fd8..45a5f77 100644
--- a/src/Pyramid-Bloc/PyramidBackgroundPaintCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBackgroundPaintCommand.class.st
@@ -11,19 +11,19 @@ PyramidBackgroundPaintCommand >> canBeUsedFor: anObject [
 		  anObject background isKindOf: BlPaintBackground ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundPaintCommand >> getGroupedValueFor: aBlElement [
 
 	^ aBlElement background paint class
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundPaintCommand >> getValueFor: aBlElement [
 
 	^ aBlElement background paint
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBackgroundPaintCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement background: (BlBackground paint: anArgument value)
diff --git a/src/Pyramid-Bloc/PyramidBackgroundPaintLinearEndCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundPaintLinearEndCommand.class.st
index 4201cb7..5489747 100644
--- a/src/Pyramid-Bloc/PyramidBackgroundPaintLinearEndCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBackgroundPaintLinearEndCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundPaintLinearEndCommand >> getValueFor: aBlElement [
 
 	^ aBlElement background paint end
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBackgroundPaintLinearEndCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement background paint end: anArgument
diff --git a/src/Pyramid-Bloc/PyramidBackgroundPaintLinearStartCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundPaintLinearStartCommand.class.st
index c62bbd9..317cd3a 100644
--- a/src/Pyramid-Bloc/PyramidBackgroundPaintLinearStartCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBackgroundPaintLinearStartCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundPaintLinearStartCommand >> getValueFor: aBlElement [
 
 	^ aBlElement background paint start
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBackgroundPaintLinearStartCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement background paint start: anArgument
diff --git a/src/Pyramid-Bloc/PyramidBackgroundPaintRadialInnerCenterCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundPaintRadialInnerCenterCommand.class.st
index e85efec..3e5181e 100644
--- a/src/Pyramid-Bloc/PyramidBackgroundPaintRadialInnerCenterCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBackgroundPaintRadialInnerCenterCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundPaintRadialInnerCenterCommand >> getValueFor: aBlElement [
 
 	^ aBlElement background paint innerCenter
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBackgroundPaintRadialInnerCenterCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement background paint innerCenter: anArgument
diff --git a/src/Pyramid-Bloc/PyramidBackgroundPaintRadialInnerRadiusCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundPaintRadialInnerRadiusCommand.class.st
index a2c2888..2416e8c 100644
--- a/src/Pyramid-Bloc/PyramidBackgroundPaintRadialInnerRadiusCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBackgroundPaintRadialInnerRadiusCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundPaintRadialInnerRadiusCommand >> getValueFor: aBlElement [
 
 	^ aBlElement background paint innerRadius
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBackgroundPaintRadialInnerRadiusCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement background paint innerRadius: anArgument
diff --git a/src/Pyramid-Bloc/PyramidBackgroundPaintRadialOuterCenterCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundPaintRadialOuterCenterCommand.class.st
index 8d8deac..352d4e4 100644
--- a/src/Pyramid-Bloc/PyramidBackgroundPaintRadialOuterCenterCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBackgroundPaintRadialOuterCenterCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundPaintRadialOuterCenterCommand >> getValueFor: aBlElement [
 
 	^ aBlElement background paint outerCenter
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBackgroundPaintRadialOuterCenterCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement background paint outerCenter: anArgument
diff --git a/src/Pyramid-Bloc/PyramidBackgroundPaintRadialOuterRadiusCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundPaintRadialOuterRadiusCommand.class.st
index f1ba79b..c313f42 100644
--- a/src/Pyramid-Bloc/PyramidBackgroundPaintRadialOuterRadiusCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBackgroundPaintRadialOuterRadiusCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundPaintRadialOuterRadiusCommand >> getValueFor: aBlElement [
 
 	^ aBlElement background paint outerRadius
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBackgroundPaintRadialOuterRadiusCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement background paint outerRadius: anArgument
diff --git a/src/Pyramid-Bloc/PyramidBackgroundPaintStopsCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundPaintStopsCommand.class.st
index faebbb2..5707390 100644
--- a/src/Pyramid-Bloc/PyramidBackgroundPaintStopsCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBackgroundPaintStopsCommand.class.st
@@ -12,7 +12,7 @@ PyramidBackgroundPaintStopsCommand >> canBeUsedFor: anObject [
 			  anObject background paint isKindOf: BlGradientPaint ] ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundPaintStopsCommand >> getValueFor: aBlElement [
 	"We ensure that we are working with a copy of the associations."
 
@@ -20,7 +20,7 @@ PyramidBackgroundPaintStopsCommand >> getValueFor: aBlElement [
 		  asso key copy -> asso value copy ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBackgroundPaintStopsCommand >> setValueFor: aBlElement with: anArgument [
 	"We ensure that we are working with a copy of the associations."
 
diff --git a/src/Pyramid-Bloc/PyramidBackgroundTypeCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundTypeCommand.class.st
index 9031fa5..77e77fa 100644
--- a/src/Pyramid-Bloc/PyramidBackgroundTypeCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBackgroundTypeCommand.class.st
@@ -4,19 +4,19 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundTypeCommand >> getGroupedValueFor: aBlElement [
 
 	^ aBlElement background class
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBackgroundTypeCommand >> getValueFor: aBlElement [
 
 	^ aBlElement background
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBackgroundTypeCommand >> setValueFor: aBlElement with: anArgument [
 	"Must be a blockClosure to ensure no background are created."
 
diff --git a/src/Pyramid-Bloc/PyramidBasicExactHorizontalConstraintsBlocCommand.class.st b/src/Pyramid-Bloc/PyramidBasicExactHorizontalConstraintsBlocCommand.class.st
index 0988c93..cbd6cff 100644
--- a/src/Pyramid-Bloc/PyramidBasicExactHorizontalConstraintsBlocCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBasicExactHorizontalConstraintsBlocCommand.class.st
@@ -11,13 +11,13 @@ PyramidBasicExactHorizontalConstraintsBlocCommand >> canBeUsedFor: anObject [
 			  anObject constraints horizontal resizer isExact ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBasicExactHorizontalConstraintsBlocCommand >> getValueFor: anObject [
 
 ^ anObject constraints horizontal resizer size
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBasicExactHorizontalConstraintsBlocCommand >> setValueFor: anObject with: anArgument [
 
 	^ anObject constraintsDo: [ :c | c horizontal exact: anArgument ] 
diff --git a/src/Pyramid-Bloc/PyramidBasicExactVerticalConstraintsBlocCommand.class.st b/src/Pyramid-Bloc/PyramidBasicExactVerticalConstraintsBlocCommand.class.st
index 664cf61..34b3f18 100644
--- a/src/Pyramid-Bloc/PyramidBasicExactVerticalConstraintsBlocCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBasicExactVerticalConstraintsBlocCommand.class.st
@@ -11,13 +11,13 @@ PyramidBasicExactVerticalConstraintsBlocCommand >> canBeUsedFor: anObject [
 		  anObject constraints vertical resizer isExact ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBasicExactVerticalConstraintsBlocCommand >> getValueFor: anObject [
 
 	^ anObject constraints vertical resizer size
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBasicExactVerticalConstraintsBlocCommand >> setValueFor: anObject with: anArgument [
 
 	^ anObject constraintsDo: [ :c | c vertical exact: anArgument ]
diff --git a/src/Pyramid-Bloc/PyramidBasicHorizontalConstraintsBlocCommand.class.st b/src/Pyramid-Bloc/PyramidBasicHorizontalConstraintsBlocCommand.class.st
index 1c1af43..3286df5 100644
--- a/src/Pyramid-Bloc/PyramidBasicHorizontalConstraintsBlocCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBasicHorizontalConstraintsBlocCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-layout'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBasicHorizontalConstraintsBlocCommand >> getValueFor: anObject [
 
 	^ anObject constraints horizontal
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #private }
 PyramidBasicHorizontalConstraintsBlocCommand >> saveStatesOf: aCollection withCommand: aCommand withArguments: anArguments [
 
 	| mementos |
@@ -26,7 +26,7 @@ PyramidBasicHorizontalConstraintsBlocCommand >> saveStatesOf: aCollection withCo
 		  yourself
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBasicHorizontalConstraintsBlocCommand >> setValueFor: anObject with: anArgument [
 
 	anArgument isSymbol
diff --git a/src/Pyramid-Bloc/PyramidBasicVerticalConstraintsBlocCommand.class.st b/src/Pyramid-Bloc/PyramidBasicVerticalConstraintsBlocCommand.class.st
index b68c720..db8daf3 100644
--- a/src/Pyramid-Bloc/PyramidBasicVerticalConstraintsBlocCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBasicVerticalConstraintsBlocCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-layout'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBasicVerticalConstraintsBlocCommand >> getValueFor: anObject [
 
 	^ anObject constraints vertical
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #private }
 PyramidBasicVerticalConstraintsBlocCommand >> saveStatesOf: aCollection withCommand: aCommand withArguments: anArguments [
 
 	| mementos |
@@ -27,7 +27,7 @@ PyramidBasicVerticalConstraintsBlocCommand >> saveStatesOf: aCollection withComm
 		  yourself
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidBasicVerticalConstraintsBlocCommand >> setValueFor: anObject with: anArgument [
 
 	anArgument isSymbol
diff --git a/src/Pyramid-Bloc/PyramidBorderDashArrayCommand.class.st b/src/Pyramid-Bloc/PyramidBorderDashArrayCommand.class.st
index c8d064a..009c994 100644
--- a/src/Pyramid-Bloc/PyramidBorderDashArrayCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderDashArrayCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderDashArrayCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border style dashArray
diff --git a/src/Pyramid-Bloc/PyramidBorderDashOffsetCommand.class.st b/src/Pyramid-Bloc/PyramidBorderDashOffsetCommand.class.st
index a30514b..ca51c9d 100644
--- a/src/Pyramid-Bloc/PyramidBorderDashOffsetCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderDashOffsetCommand.class.st
@@ -11,7 +11,7 @@ PyramidBorderDashOffsetCommand >> canBeUsedFor: anObject [
 		  anObject border style dashArray isNotEmpty ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderDashOffsetCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border style dashOffset
diff --git a/src/Pyramid-Bloc/PyramidBorderLineCapCommand.class.st b/src/Pyramid-Bloc/PyramidBorderLineCapCommand.class.st
index 90ae60e..f9c1085 100644
--- a/src/Pyramid-Bloc/PyramidBorderLineCapCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderLineCapCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderLineCapCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border style lineCap
diff --git a/src/Pyramid-Bloc/PyramidBorderLineJoinCommand.class.st b/src/Pyramid-Bloc/PyramidBorderLineJoinCommand.class.st
index 3ea1dbb..3b46143 100644
--- a/src/Pyramid-Bloc/PyramidBorderLineJoinCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderLineJoinCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderLineJoinCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border style lineJoin
diff --git a/src/Pyramid-Bloc/PyramidBorderMiterLimitCommand.class.st b/src/Pyramid-Bloc/PyramidBorderMiterLimitCommand.class.st
index e70e6d4..c6f8644 100644
--- a/src/Pyramid-Bloc/PyramidBorderMiterLimitCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderMiterLimitCommand.class.st
@@ -11,7 +11,7 @@ PyramidBorderMiterLimitCommand >> canBeUsedFor: anObject [
 		  (anObject border style lineJoin isKindOf: BlStrokeLineMiterJoin) ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderMiterLimitCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border style miterLimit
diff --git a/src/Pyramid-Bloc/PyramidBorderOpacityCommand.class.st b/src/Pyramid-Bloc/PyramidBorderOpacityCommand.class.st
index e1d6b44..5c818ac 100644
--- a/src/Pyramid-Bloc/PyramidBorderOpacityCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderOpacityCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderOpacityCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border opacity
diff --git a/src/Pyramid-Bloc/PyramidBorderPaintColorCommand.class.st b/src/Pyramid-Bloc/PyramidBorderPaintColorCommand.class.st
index 10eeb2d..de5ff49 100644
--- a/src/Pyramid-Bloc/PyramidBorderPaintColorCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderPaintColorCommand.class.st
@@ -11,7 +11,7 @@ PyramidBorderPaintColorCommand >> canBeUsedFor: anObject [
 		  anObject border paint isKindOf: BlColorPaint ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderPaintColorCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border paint color
diff --git a/src/Pyramid-Bloc/PyramidBorderPaintCommand.class.st b/src/Pyramid-Bloc/PyramidBorderPaintCommand.class.st
index 44fb1a6..85ac677 100644
--- a/src/Pyramid-Bloc/PyramidBorderPaintCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderPaintCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderPaintCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border paint
diff --git a/src/Pyramid-Bloc/PyramidBorderPaintLinearDirectionEndCommand.class.st b/src/Pyramid-Bloc/PyramidBorderPaintLinearDirectionEndCommand.class.st
index 1b18eb8..5b30c8b 100644
--- a/src/Pyramid-Bloc/PyramidBorderPaintLinearDirectionEndCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderPaintLinearDirectionEndCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderPaintLinearDirectionEndCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border paint end
diff --git a/src/Pyramid-Bloc/PyramidBorderPaintLinearDirectionStartCommand.class.st b/src/Pyramid-Bloc/PyramidBorderPaintLinearDirectionStartCommand.class.st
index 4f08a8a..ca09f43 100644
--- a/src/Pyramid-Bloc/PyramidBorderPaintLinearDirectionStartCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderPaintLinearDirectionStartCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderPaintLinearDirectionStartCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border paint start
diff --git a/src/Pyramid-Bloc/PyramidBorderPaintRadialInnerCenterCommand.class.st b/src/Pyramid-Bloc/PyramidBorderPaintRadialInnerCenterCommand.class.st
index bdb47e7..e95c8e3 100644
--- a/src/Pyramid-Bloc/PyramidBorderPaintRadialInnerCenterCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderPaintRadialInnerCenterCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderPaintRadialInnerCenterCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border paint innerCenter
diff --git a/src/Pyramid-Bloc/PyramidBorderPaintRadialInnerRadiusCommand.class.st b/src/Pyramid-Bloc/PyramidBorderPaintRadialInnerRadiusCommand.class.st
index 8f6a281..a2f83c2 100644
--- a/src/Pyramid-Bloc/PyramidBorderPaintRadialInnerRadiusCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderPaintRadialInnerRadiusCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderPaintRadialInnerRadiusCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border paint innerRadius
diff --git a/src/Pyramid-Bloc/PyramidBorderPaintRadialOuterCenterCommand.class.st b/src/Pyramid-Bloc/PyramidBorderPaintRadialOuterCenterCommand.class.st
index 5a32a29..9cc5cc8 100644
--- a/src/Pyramid-Bloc/PyramidBorderPaintRadialOuterCenterCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderPaintRadialOuterCenterCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderPaintRadialOuterCenterCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border paint outerCenter
diff --git a/src/Pyramid-Bloc/PyramidBorderPaintRadialOuterRadiusCommand.class.st b/src/Pyramid-Bloc/PyramidBorderPaintRadialOuterRadiusCommand.class.st
index 43c5b54..95a573e 100644
--- a/src/Pyramid-Bloc/PyramidBorderPaintRadialOuterRadiusCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderPaintRadialOuterRadiusCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderPaintRadialOuterRadiusCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border paint outerRadius
diff --git a/src/Pyramid-Bloc/PyramidBorderPaintStopsCommand.class.st b/src/Pyramid-Bloc/PyramidBorderPaintStopsCommand.class.st
index 2626a3d..da99423 100644
--- a/src/Pyramid-Bloc/PyramidBorderPaintStopsCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderPaintStopsCommand.class.st
@@ -11,7 +11,7 @@ PyramidBorderPaintStopsCommand >> canBeUsedFor: anObject [
 			  anObject border paint isKindOf: BlGradientPaint  ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderPaintStopsCommand >> getValueFor: aBlElement [
 	"We ensure that we are working with a copy of the associations."
 
diff --git a/src/Pyramid-Bloc/PyramidBorderWidthCommand.class.st b/src/Pyramid-Bloc/PyramidBorderWidthCommand.class.st
index b943532..f7ed745 100644
--- a/src/Pyramid-Bloc/PyramidBorderWidthCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidBorderWidthCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidBorderWidthCommand >> getValueFor: aBlElement [
 
 	^ aBlElement border width
diff --git a/src/Pyramid-Bloc/PyramidChangeOrderWithIndexCommand.class.st b/src/Pyramid-Bloc/PyramidChangeOrderWithIndexCommand.class.st
index f314fb8..9db7920 100644
--- a/src/Pyramid-Bloc/PyramidChangeOrderWithIndexCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidChangeOrderWithIndexCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-order'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidChangeOrderWithIndexCommand >> setValueFor: aBlElement with: anArgument [
 
 	| currentIndex parent |
diff --git a/src/Pyramid-Bloc/PyramidChangeTextCommand.class.st b/src/Pyramid-Bloc/PyramidChangeTextCommand.class.st
index 93a2bbd..228a26b 100644
--- a/src/Pyramid-Bloc/PyramidChangeTextCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidChangeTextCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-text'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidChangeTextCommand >> getValueFor: aBlTextElement [
 
 	^ aBlTextElement text asString
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidChangeTextCommand >> setValueFor: aBlTextElement with: aString [
 
 	| attributes rope |
diff --git a/src/Pyramid-Bloc/PyramidChildrenCommand.class.st b/src/Pyramid-Bloc/PyramidChildrenCommand.class.st
index 0331d15..d06778e 100644
--- a/src/Pyramid-Bloc/PyramidChildrenCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidChildrenCommand.class.st
@@ -10,13 +10,13 @@ PyramidChildrenCommand class >> isAbstract [
 	^ self == PyramidChildrenCommand
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidChildrenCommand >> getValueFor: aBlElement [
 
 	^ nil
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #private }
 PyramidChildrenCommand >> saveStatesOf: aCollection withCommand: aCommand withArguments: anArguments [
 
 	| mementos |
diff --git a/src/Pyramid-Bloc/PyramidClipChildrenCommand.class.st b/src/Pyramid-Bloc/PyramidClipChildrenCommand.class.st
index a4209f4..df44798 100644
--- a/src/Pyramid-Bloc/PyramidClipChildrenCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidClipChildrenCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidClipChildrenCommand >> getValueFor: aBlElement [
 
 	^ aBlElement clipChildren
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidClipChildrenCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement clipChildren: anArgument
diff --git a/src/Pyramid-Bloc/PyramidDynamicResizeCommand.class.st b/src/Pyramid-Bloc/PyramidDynamicResizeCommand.class.st
index 816bac0..0808cfe 100644
--- a/src/Pyramid-Bloc/PyramidDynamicResizeCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidDynamicResizeCommand.class.st
@@ -11,19 +11,19 @@ PyramidDynamicResizeCommand >> canBeUsedFor: anObject [
 			  anObject size ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidDynamicResizeCommand >> commandInverse [ 
 
 	^ PyramidUndoDynamicResizeBlocCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidDynamicResizeCommand >> getValueFor: anObject [
 
 	^ anObject extent
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidDynamicResizeCommand >> saveStatesWithCommandInverseOf: aCollection with: arguments [
 	| mementos |
 
@@ -39,7 +39,7 @@ PyramidDynamicResizeCommand >> saveStatesWithCommandInverseOf: aCollection with:
 		  yourself
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidDynamicResizeCommand >> setValueFor: anObject with: anArgument [
 
 	^ anObject constraintsDo: [ :c |
diff --git a/src/Pyramid-Bloc/PyramidElementIdCommand.class.st b/src/Pyramid-Bloc/PyramidElementIdCommand.class.st
index 66f8948..f6c4826 100644
--- a/src/Pyramid-Bloc/PyramidElementIdCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidElementIdCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidElementIdCommand >> getValueFor: aBlElement [
 
 	^ aBlElement id
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidElementIdCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement id: anArgument
diff --git a/src/Pyramid-Bloc/PyramidFontSizeCommand.class.st b/src/Pyramid-Bloc/PyramidFontSizeCommand.class.st
index 8dbf1c8..ae3786a 100644
--- a/src/Pyramid-Bloc/PyramidFontSizeCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidFontSizeCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-text'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidFontSizeCommand >> getValueFor: aBlTextElement [
 
 	aBlTextElement text attributesFinder
@@ -14,7 +14,7 @@ PyramidFontSizeCommand >> getValueFor: aBlTextElement [
 			^ 10
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidFontSizeCommand >> setValueFor: aBlTextElement with: aNumber [
 
 	aBlTextElement text attribute: (BlFontSizeAttribute size: aNumber).
diff --git a/src/Pyramid-Bloc/PyramidFontWeightCommand.class.st b/src/Pyramid-Bloc/PyramidFontWeightCommand.class.st
index a7c5ba9..5a175d2 100644
--- a/src/Pyramid-Bloc/PyramidFontWeightCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidFontWeightCommand.class.st
@@ -4,14 +4,14 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-text'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidFontWeightCommand >> getValueFor: aBlTextElement [
 
 	aBlTextElement text attributesFinder findAttributesSuchThat: [ :a | a class = BlFontWeightAttribute ] indicesDo: [ :new :old :a | ^ a weight ].
 	^ LogicalFont weightRegular
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidFontWeightCommand >> setValueFor: aBlTextElement with: aNumber [
 
 	aBlTextElement text attribute:
diff --git a/src/Pyramid-Bloc/PyramidFrameHorizontalConstraintsCommand.class.st b/src/Pyramid-Bloc/PyramidFrameHorizontalConstraintsCommand.class.st
index 271f6c0..62753f9 100644
--- a/src/Pyramid-Bloc/PyramidFrameHorizontalConstraintsCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidFrameHorizontalConstraintsCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-layout'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidFrameHorizontalConstraintsCommand >> getValueFor: anObject [
 
 	^ anObject constraints frame horizontal alignment
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidFrameHorizontalConstraintsCommand >> setValueFor: anObject with: anArgument [
 
 	anObject constraintsDo: [ :c |
diff --git a/src/Pyramid-Bloc/PyramidFrameVerticalConstraintsCommand.class.st b/src/Pyramid-Bloc/PyramidFrameVerticalConstraintsCommand.class.st
index 99b53c7..af0b290 100644
--- a/src/Pyramid-Bloc/PyramidFrameVerticalConstraintsCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidFrameVerticalConstraintsCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-layout'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidFrameVerticalConstraintsCommand >> getValueFor: anObject [
 
 	^ anObject constraints frame vertical alignment
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidFrameVerticalConstraintsCommand >> setValueFor: anObject with: anArgument [
 
 	anObject constraintsDo: [ :c |
diff --git a/src/Pyramid-Bloc/PyramidGeometryCommand.class.st b/src/Pyramid-Bloc/PyramidGeometryCommand.class.st
index 411acf8..ad6277e 100644
--- a/src/Pyramid-Bloc/PyramidGeometryCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidGeometryCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-geometry'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidGeometryCommand >> getValueFor: aBlElement [
 
 	^ aBlElement geometry
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidGeometryCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement geometry: anArgument
diff --git a/src/Pyramid-Bloc/PyramidGroupCommand.class.st b/src/Pyramid-Bloc/PyramidGroupCommand.class.st
index bfb54ab..e5292bd 100644
--- a/src/Pyramid-Bloc/PyramidGroupCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidGroupCommand.class.st
@@ -20,7 +20,7 @@ PyramidGroupCommand >> canBeUsedFor: aCollectionOfBlElements [
 				  each parent = parent ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidGroupCommand >> commandInverse [
 	"Command used to undo the group."
 
@@ -67,7 +67,7 @@ PyramidGroupCommand >> createNewGroupElement: aCollectionOfBlElement [
 		  yourself.
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidGroupCommand >> getValueFor: aBlElement [
 
 	^ self historyCommandArguments
@@ -106,7 +106,7 @@ PyramidGroupCommand >> positionGroupElement: groupElement [
 			child constraints position - (currentLeft @ currentTop) ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidGroupCommand >> saveStatesOf: aCollection with: arguments [
 
 	^ self
@@ -116,7 +116,7 @@ PyramidGroupCommand >> saveStatesOf: aCollection with: arguments [
 		  (self commandRestaurationArgumentsFor: aCollection and: arguments)
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidGroupCommand >> saveStatesWithCommandInverseOf: aCollection with: arguments [
 
 	^ self
@@ -126,7 +126,7 @@ PyramidGroupCommand >> saveStatesWithCommandInverseOf: aCollection with: argumen
 		  (self commandInverseArgumentsFor: aCollection and: arguments)
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidGroupCommand >> setValueFor: aCollectionToGroup with: aCollectionOfFirstLevelElements [
 
 	| groupInCorrectOrder parent groupElement removedElementFromFirstLevel |
diff --git a/src/Pyramid-Bloc/PyramidLayoutBlocCommand.class.st b/src/Pyramid-Bloc/PyramidLayoutBlocCommand.class.st
index 880f6ed..fd6180e 100644
--- a/src/Pyramid-Bloc/PyramidLayoutBlocCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidLayoutBlocCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-layout'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidLayoutBlocCommand >> getValueFor: anObject [
 
 	^ anObject layout
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidLayoutBlocCommand >> setValueFor: anObject with: anArgument [
 
 	anObject layout: anArgument
diff --git a/src/Pyramid-Bloc/PyramidLayoutChangeOrientationCommand.class.st b/src/Pyramid-Bloc/PyramidLayoutChangeOrientationCommand.class.st
index 57cc5aa..26ec48b 100644
--- a/src/Pyramid-Bloc/PyramidLayoutChangeOrientationCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidLayoutChangeOrientationCommand.class.st
@@ -11,13 +11,13 @@ PyramidLayoutChangeOrientationCommand >> canBeUsedFor: anObject [
 		   { BlFlowLayout . BlLinearLayout } includes: anObject layout class ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidLayoutChangeOrientationCommand >> getValueFor: anObject [
 
 	^ anObject layout orientation
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidLayoutChangeOrientationCommand >> setValueFor: anObject with: anArgument [
 
 	anObject layout orientation: anArgument
diff --git a/src/Pyramid-Bloc/PyramidMarginCommand.class.st b/src/Pyramid-Bloc/PyramidMarginCommand.class.st
index 4095033..c773ea9 100644
--- a/src/Pyramid-Bloc/PyramidMarginCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidMarginCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-layout'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidMarginCommand >> getValueFor: aBlElement [
 
 	^ aBlElement margin
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidMarginCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement margin: anArgument
diff --git a/src/Pyramid-Bloc/PyramidMoveBackwardOrderCommand.class.st b/src/Pyramid-Bloc/PyramidMoveBackwardOrderCommand.class.st
index 4fc68ba..6003f24 100644
--- a/src/Pyramid-Bloc/PyramidMoveBackwardOrderCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidMoveBackwardOrderCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-order'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidMoveBackwardOrderCommand >> commandInverse [
 
 	^ PyramidMoveForwardOrderCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidMoveBackwardOrderCommand >> setValueFor: aBlElement with: anArgument [
 
 	| currentIndex |
diff --git a/src/Pyramid-Bloc/PyramidMoveChildInParentCommand.class.st b/src/Pyramid-Bloc/PyramidMoveChildInParentCommand.class.st
index 362a3ca..df0b5e5 100644
--- a/src/Pyramid-Bloc/PyramidMoveChildInParentCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidMoveChildInParentCommand.class.st
@@ -7,13 +7,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidMoveChildInParentCommand >> getValueFor: aBlElement [
 
 	^ nil
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #private }
 PyramidMoveChildInParentCommand >> saveStatesOf: aCollection withCommand: aCommand withArguments: anArguments [
 
 	| mementos |
diff --git a/src/Pyramid-Bloc/PyramidMoveChildIndexDownCommand.class.st b/src/Pyramid-Bloc/PyramidMoveChildIndexDownCommand.class.st
index be0b637..5742b92 100644
--- a/src/Pyramid-Bloc/PyramidMoveChildIndexDownCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidMoveChildIndexDownCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidMoveChildIndexDownCommand >> commandInverse [
 
 	^ PyramidMoveChildIndexUpCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidMoveChildIndexDownCommand >> setValueFor: aBlElementParent with: aBlElementToMove [
 
 	| childIndexToMove |
diff --git a/src/Pyramid-Bloc/PyramidMoveChildIndexUpCommand.class.st b/src/Pyramid-Bloc/PyramidMoveChildIndexUpCommand.class.st
index 4eabe2d..bf5c13a 100644
--- a/src/Pyramid-Bloc/PyramidMoveChildIndexUpCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidMoveChildIndexUpCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidMoveChildIndexUpCommand >> commandInverse [
 
 	^ PyramidMoveChildIndexDownCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidMoveChildIndexUpCommand >> setValueFor: aBlElementParent with: aBlElementToMove [
 
 	| childIndexToMove |
diff --git a/src/Pyramid-Bloc/PyramidMoveForwardOrderCommand.class.st b/src/Pyramid-Bloc/PyramidMoveForwardOrderCommand.class.st
index 35008ed..4eb2ec1 100644
--- a/src/Pyramid-Bloc/PyramidMoveForwardOrderCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidMoveForwardOrderCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-order'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidMoveForwardOrderCommand >> commandInverse [
 
 	^ PyramidMoveBackwardOrderCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidMoveForwardOrderCommand >> setValueFor: aBlElement with: anArgument [
 
 	| currentIndex |
diff --git a/src/Pyramid-Bloc/PyramidOnBackgroundOrderCommand.class.st b/src/Pyramid-Bloc/PyramidOnBackgroundOrderCommand.class.st
index 257fd1b..9a67178 100644
--- a/src/Pyramid-Bloc/PyramidOnBackgroundOrderCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidOnBackgroundOrderCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-order'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidOnBackgroundOrderCommand >> commandInverse [
 
 	^ PyramidChangeOrderWithIndexCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidOnBackgroundOrderCommand >> setValueFor: aBlElement with: anArgument [
 
 	| currentIndex parent |
diff --git a/src/Pyramid-Bloc/PyramidOnForegroundOrderCommand.class.st b/src/Pyramid-Bloc/PyramidOnForegroundOrderCommand.class.st
index dda01bb..41477cf 100644
--- a/src/Pyramid-Bloc/PyramidOnForegroundOrderCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidOnForegroundOrderCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-order'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidOnForegroundOrderCommand >> commandInverse [
 
 	^ PyramidChangeOrderWithIndexCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidOnForegroundOrderCommand >> setValueFor: aBlElement with: anArgument [
 
 	| currentIndex parent |
diff --git a/src/Pyramid-Bloc/PyramidOpacityCommand.class.st b/src/Pyramid-Bloc/PyramidOpacityCommand.class.st
index 31e02fd..0b8b82d 100644
--- a/src/Pyramid-Bloc/PyramidOpacityCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidOpacityCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidOpacityCommand >> getValueFor: aBlElement [
 
 	^ aBlElement opacity
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidOpacityCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement opacity: anArgument
diff --git a/src/Pyramid-Bloc/PyramidOutskirtsCommand.class.st b/src/Pyramid-Bloc/PyramidOutskirtsCommand.class.st
index 0742189..288e90e 100644
--- a/src/Pyramid-Bloc/PyramidOutskirtsCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidOutskirtsCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-visuals'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidOutskirtsCommand >> getValueFor: aBlElement [
 
 	^ aBlElement outskirts
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidOutskirtsCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement outskirts: anArgument
diff --git a/src/Pyramid-Bloc/PyramidPaddingCommand.class.st b/src/Pyramid-Bloc/PyramidPaddingCommand.class.st
index 50eb962..8e5c4c0 100644
--- a/src/Pyramid-Bloc/PyramidPaddingCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidPaddingCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-layout'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidPaddingCommand >> getValueFor: aBlElement [
 
 	^ aBlElement padding
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidPaddingCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement padding: anArgument
diff --git a/src/Pyramid-Bloc/PyramidPositionCommand.class.st b/src/Pyramid-Bloc/PyramidPositionCommand.class.st
index 7f586f7..96f1ac9 100644
--- a/src/Pyramid-Bloc/PyramidPositionCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidPositionCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-layout'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidPositionCommand >> getValueFor: aBlElement [
 
 	^ aBlElement constraints position
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidPositionCommand >> setValueFor: aBlElement with: anArgument [
 
 	anArgument isPoint ifFalse: [ ^ self ].
diff --git a/src/Pyramid-Bloc/PyramidPositionOffsetCommand.class.st b/src/Pyramid-Bloc/PyramidPositionOffsetCommand.class.st
index 6abce72..9bef231 100644
--- a/src/Pyramid-Bloc/PyramidPositionOffsetCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidPositionOffsetCommand.class.st
@@ -4,25 +4,25 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-layout'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidPositionOffsetCommand >> commandInverse [
 
 	^ PyramidPositionCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidPositionOffsetCommand >> getValueFor: aBlElement [
 
 	^ aBlElement constraints position
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidPositionOffsetCommand >> saveStatesOf: aCollection with: arguments [
 
 	^ self saveStatesWithCommandInverseOf: aCollection with: arguments
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidPositionOffsetCommand >> setValueFor: aBlElement with: anArgument [
 
 	anArgument isPoint ifFalse: [ ^ self ].
diff --git a/src/Pyramid-Bloc/PyramidProportionalHorizontalConstraintsCommand.class.st b/src/Pyramid-Bloc/PyramidProportionalHorizontalConstraintsCommand.class.st
index 61b5aaf..ebd5ca2 100644
--- a/src/Pyramid-Bloc/PyramidProportionalHorizontalConstraintsCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidProportionalHorizontalConstraintsCommand.class.st
@@ -4,14 +4,14 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-layout'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidProportionalHorizontalConstraintsCommand >> getValueFor: anObject [
 
 	^ anObject constraints proportional horizontal left
 	  @ anObject constraints proportional horizontal right
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidProportionalHorizontalConstraintsCommand >> setValueFor: anObject with: anArgument [
 
 	anObject constraintsDo: [ :c |
diff --git a/src/Pyramid-Bloc/PyramidProportionalVerticalConstraintsCommand.class.st b/src/Pyramid-Bloc/PyramidProportionalVerticalConstraintsCommand.class.st
index 466755d..38324d5 100644
--- a/src/Pyramid-Bloc/PyramidProportionalVerticalConstraintsCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidProportionalVerticalConstraintsCommand.class.st
@@ -4,14 +4,14 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-layout'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidProportionalVerticalConstraintsCommand >> getValueFor: anObject [
 
 	^ anObject constraints proportional vertical top
 	  @ anObject constraints proportional vertical bottom
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidProportionalVerticalConstraintsCommand >> setValueFor: anObject with: anArgument [
 
 	anObject constraintsDo: [ :c |
diff --git a/src/Pyramid-Bloc/PyramidRedoGroupCommand.class.st b/src/Pyramid-Bloc/PyramidRedoGroupCommand.class.st
index 05c74d6..a21047f 100644
--- a/src/Pyramid-Bloc/PyramidRedoGroupCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidRedoGroupCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-group'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidRedoGroupCommand >> commandInverse [
 
 	^ PyramidUndoGroupCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidRedoGroupCommand >> getValueFor: aBlElement [
 
 	^ nil
@@ -34,7 +34,7 @@ PyramidRedoGroupCommand >> positionGroupElement: groupElement [
 			child constraints position - (currentLeft @ currentTop) ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidRedoGroupCommand >> setValueFor: aCollectionToGroup with: aGroupModel [
 
 	| anyElementInFirstLevels |
diff --git a/src/Pyramid-Bloc/PyramidRemoveChildCommand.class.st b/src/Pyramid-Bloc/PyramidRemoveChildCommand.class.st
index 2288f8f..dc97608 100644
--- a/src/Pyramid-Bloc/PyramidRemoveChildCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidRemoveChildCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidRemoveChildCommand >> commandInverse [
 
 	^ PyramidAddChildCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidRemoveChildCommand >> setValueFor: aBlElement with: aChildToRemove [
 
 	aBlElement removeChild: aChildToRemove
diff --git a/src/Pyramid-Bloc/PyramidRemoveChildrenCommand.class.st b/src/Pyramid-Bloc/PyramidRemoveChildrenCommand.class.st
index 6d09bbb..70cdbc1 100644
--- a/src/Pyramid-Bloc/PyramidRemoveChildrenCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidRemoveChildrenCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidRemoveChildrenCommand >> commandInverse [
 
 	^ PyramidAddChildrenCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidRemoveChildrenCommand >> setValueFor: aBlElement with: aChildrenToAdd [
 
 	aBlElement removeChildren: aChildrenToAdd
diff --git a/src/Pyramid-Bloc/PyramidRemoveSelectedElementsCommand.class.st b/src/Pyramid-Bloc/PyramidRemoveSelectedElementsCommand.class.st
index 2beae59..dee6455 100644
--- a/src/Pyramid-Bloc/PyramidRemoveSelectedElementsCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidRemoveSelectedElementsCommand.class.st
@@ -7,21 +7,22 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidRemoveSelectedElementsCommand >> getValueFor: anElementOfSelection [
 
 	^ nil
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidRemoveSelectedElementsCommand >> mementoFor: anElement withArguments: anArgument [
 
+	self saveIndexOf: anElement.
 	(anArgument includes: anElement) ifTrue: [
-		^ PyramidCommandMemento new
-			  command: PyramidRemoveFromCollectionCommand new commandInverse;
-			  target: anArgument;
-			  arguments: anElement;
-			  yourself ].
+			^ PyramidCommandMemento new
+				  command: PyramidRemoveFromCollectionCommand new commandInverse;
+				  target: anArgument;
+				  arguments: anElement;
+				  yourself ].
 	^ PyramidCommandMemento new
 		  command: PyramidRemoveChildCommand new commandInverse;
 		  target: anElement parent;
@@ -41,14 +42,24 @@ PyramidRemoveSelectedElementsCommand >> mementoInverse: anObject [
 	mementoInverse := anObject
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #private }
+PyramidRemoveSelectedElementsCommand >> saveIndexOf: anElement [
+
+	| index |
+	index := anElement parent
+		         ifNotNil: [ :p | p children indexOf: anElement ]
+		         ifNil: [ 0 ].
+	anElement userData at: #removedAtIndex put: index
+]
+
+{ #category : #history }
 PyramidRemoveSelectedElementsCommand >> saveStatesOf: aCollection with: aRoots [
 	"We ignore the state recovery for the redo, we will force the inverse of the undo state."
 
 	^ self mementoInverse accept: PyramidMementoInverser new.
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidRemoveSelectedElementsCommand >> saveStatesWithCommandInverseOf: aCollection with: aRoots [
 
 	| mementos finalMemento |
@@ -64,7 +75,7 @@ PyramidRemoveSelectedElementsCommand >> saveStatesWithCommandInverseOf: aCollect
 	^ finalMemento
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidRemoveSelectedElementsCommand >> setValueFor: aBlElementToRemove with: aRoot [
 	"Remove the element from its parent"
 
diff --git a/src/Pyramid-Bloc/PyramidRoundedRectangleCornerRadiiCommand.class.st b/src/Pyramid-Bloc/PyramidRoundedRectangleCornerRadiiCommand.class.st
index f239660..a035164 100644
--- a/src/Pyramid-Bloc/PyramidRoundedRectangleCornerRadiiCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidRoundedRectangleCornerRadiiCommand.class.st
@@ -11,13 +11,13 @@ PyramidRoundedRectangleCornerRadiiCommand >> canBeUsedFor: anObject [
 		  anObject geometry class = BlRoundedRectangleGeometry ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidRoundedRectangleCornerRadiiCommand >> getValueFor: aBlElement [
 
 	^ aBlElement geometry cornerRadii
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidRoundedRectangleCornerRadiiCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement geometry: (BlRoundedRectangleGeometry cornerRadii: anArgument)
diff --git a/src/Pyramid-Bloc/PyramidTextForegroundCommand.class.st b/src/Pyramid-Bloc/PyramidTextForegroundCommand.class.st
index ac96ad6..e904f32 100644
--- a/src/Pyramid-Bloc/PyramidTextForegroundCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidTextForegroundCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-text'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidTextForegroundCommand >> getValueFor: aBlTextElement [
 
 	aBlTextElement text attributesFinder
@@ -14,7 +14,7 @@ PyramidTextForegroundCommand >> getValueFor: aBlTextElement [
 	^ Color black
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidTextForegroundCommand >> setValueFor: aBlTextElement with: aColor [
 
 	aBlTextElement text attribute:
diff --git a/src/Pyramid-Bloc/PyramidUndoDynamicResizeBlocCommand.class.st b/src/Pyramid-Bloc/PyramidUndoDynamicResizeBlocCommand.class.st
index 6cf5688..127f708 100644
--- a/src/Pyramid-Bloc/PyramidUndoDynamicResizeBlocCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidUndoDynamicResizeBlocCommand.class.st
@@ -11,19 +11,19 @@ PyramidUndoDynamicResizeBlocCommand >> canBeUsedFor: anObject [
 			  anObject size ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidUndoDynamicResizeBlocCommand >> commandInverse [ 
 
 	^ PyramidDynamicResizeCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidUndoDynamicResizeBlocCommand >> getValueFor: anObject [
 
 	^ anObject userData at: #pyramidPreviousDynamicResize
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidUndoDynamicResizeBlocCommand >> setValueFor: anObject with: anArgument [
 
 	^ anObject constraintsDo: [ :c |
diff --git a/src/Pyramid-Bloc/PyramidUndoGroupCommand.class.st b/src/Pyramid-Bloc/PyramidUndoGroupCommand.class.st
index 8fb36fa..c6cd082 100644
--- a/src/Pyramid-Bloc/PyramidUndoGroupCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidUndoGroupCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-group'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidUndoGroupCommand >> commandInverse [
 
 	^ PyramidRedoGroupCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidUndoGroupCommand >> getValueFor: aBlElement [
 
 	^ nil
@@ -27,7 +27,7 @@ PyramidUndoGroupCommand >> positionChildrenOfGroupElement: groupElement [
 			child constraints position + (currentLeft @ currentTop) ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidUndoGroupCommand >> setValueFor: aCollectionToGroup with: aGroupModel [
 	"Remove children of group.
 	Remove children of origin.
diff --git a/src/Pyramid-Bloc/PyramidVisibilityCommand.class.st b/src/Pyramid-Bloc/PyramidVisibilityCommand.class.st
index bb53e30..fd46591 100644
--- a/src/Pyramid-Bloc/PyramidVisibilityCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidVisibilityCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidVisibilityCommand >> getValueFor: aBlElement [
 
 	^ aBlElement visibility
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidVisibilityCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement visibility: anArgument
diff --git a/src/Pyramid-Bloc/PyramidWeightConstraintsCommand.class.st b/src/Pyramid-Bloc/PyramidWeightConstraintsCommand.class.st
index 19f6008..2586c90 100644
--- a/src/Pyramid-Bloc/PyramidWeightConstraintsCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidWeightConstraintsCommand.class.st
@@ -12,13 +12,13 @@ PyramidWeightConstraintsCommand >> canBeUsedFor: anObject [
 		   { BlFlowLayout . BlLinearLayout } includes: anObject parent layout class ] ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidWeightConstraintsCommand >> getValueFor: anObject [
 
 	^ anObject constraints linear weight
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidWeightConstraintsCommand >> setValueFor: anObject with: anArgument [
 
 	anObject constraints linear weight: anArgument.
diff --git a/src/Pyramid-Bloc/PyramidZIndexCommand.class.st b/src/Pyramid-Bloc/PyramidZIndexCommand.class.st
index 3e09f72..1ce2282 100644
--- a/src/Pyramid-Bloc/PyramidZIndexCommand.class.st
+++ b/src/Pyramid-Bloc/PyramidZIndexCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidZIndexCommand >> getValueFor: aBlElement [
 
 	^ aBlElement elevation elevation
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidZIndexCommand >> setValueFor: aBlElement with: anArgument [
 
 	aBlElement zIndex: anArgument
diff --git a/src/Pyramid-Tests/PyramidDecreaseMockCommand.class.st b/src/Pyramid-Tests/PyramidDecreaseMockCommand.class.st
index 6e1c22c..6b72ba7 100644
--- a/src/Pyramid-Tests/PyramidDecreaseMockCommand.class.st
+++ b/src/Pyramid-Tests/PyramidDecreaseMockCommand.class.st
@@ -4,19 +4,19 @@ Class {
 	#category : #'Pyramid-Tests-cases-command'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidDecreaseMockCommand >> commandInverse [
 
 	^ PyramidIncreaseMockCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidDecreaseMockCommand >> getValueFor: anObject [
 
 ^ nil
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidDecreaseMockCommand >> setValueFor: anObject with: anArgument [
 
 	anObject count: anObject count - 1
diff --git a/src/Pyramid-Tests/PyramidIncreaseMockCommand.class.st b/src/Pyramid-Tests/PyramidIncreaseMockCommand.class.st
index cd86946..22b48fd 100644
--- a/src/Pyramid-Tests/PyramidIncreaseMockCommand.class.st
+++ b/src/Pyramid-Tests/PyramidIncreaseMockCommand.class.st
@@ -4,19 +4,19 @@ Class {
 	#category : #'Pyramid-Tests-cases-command'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidIncreaseMockCommand >> commandInverse [
 
 	^ PyramidDecreaseMockCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidIncreaseMockCommand >> getValueFor: anObject [
 
 	^ nil
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidIncreaseMockCommand >> setValueFor: anObject with: anArgument [
 
 	anObject count: anObject count + 1
diff --git a/src/Pyramid-Tests/PyramidSimpleMockCommand.class.st b/src/Pyramid-Tests/PyramidSimpleMockCommand.class.st
index abf1e62..3160782 100644
--- a/src/Pyramid-Tests/PyramidSimpleMockCommand.class.st
+++ b/src/Pyramid-Tests/PyramidSimpleMockCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Tests-cases-command'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidSimpleMockCommand >> getValueFor: anObject [
 
 	^ anObject count.
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidSimpleMockCommand >> setValueFor: anObject with: anArgument [
 
 	anObject count: anArgument
diff --git a/src/Pyramid-Tests/PyramidSimpleMockGroupedCommand.class.st b/src/Pyramid-Tests/PyramidSimpleMockGroupedCommand.class.st
index 84fcebb..2a34f66 100644
--- a/src/Pyramid-Tests/PyramidSimpleMockGroupedCommand.class.st
+++ b/src/Pyramid-Tests/PyramidSimpleMockGroupedCommand.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'Pyramid-Tests-cases-command'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidSimpleMockGroupedCommand >> getGroupedValueFor: anObject [
 
 	^ #group
diff --git a/src/Pyramid-Tests/PyramidUndoRemoveChildCommandTest.class.st b/src/Pyramid-Tests/PyramidUndoRemoveChildCommandTest.class.st
new file mode 100644
index 0000000..76ffedc
--- /dev/null
+++ b/src/Pyramid-Tests/PyramidUndoRemoveChildCommandTest.class.st
@@ -0,0 +1,87 @@
+Class {
+	#name : #PyramidUndoRemoveChildCommandTest,
+	#superclass : #TestCase,
+	#category : #'Pyramid-Tests-cases-plugin-bloc'
+}
+
+{ #category : #tests }
+PyramidUndoRemoveChildCommandTest >> testUndoRemoveAllChildrenRestoresIndex [
+
+	| history commandExecutor parent child1 child2 child3 child4|
+	parent := BlElement new.
+	child1 := BlElement new.
+	child2 := BlElement new.
+	child3 := BlElement new.
+	child4 := BlElement new.
+	parent addChildren: {child1. child2 .child3. child4}.
+
+	history := PyramidHistory new.
+	commandExecutor := PyramidHistoryCommandExecutor new
+		                   history: history;
+		                   wrappee: PyramidMainCommandExecutor new;
+		                   yourself.
+	commandExecutor
+		use: PyramidRemoveSelectedElementsCommand new
+		on: {
+				child4.
+				child2.
+				child1 }
+		with: { parent }.
+
+	self deny: (parent children includes: child2).
+	self deny: (parent children includes: child1).
+	self deny: (parent children includes: child4).
+
+	"Undo"
+	history undo.
+
+	self assert: (parent children includes: child1).
+	self assert: (parent children includes: child2).
+	self assert: (parent children indexOf: child1) equals: 1.
+	self assert: (parent children indexOf: child2) equals: 2.
+	self assert: (parent children indexOf: child4) equals: 4
+]
+
+{ #category : #tests }
+PyramidUndoRemoveChildCommandTest >> testUndoRemoveChildRestoresIndex [
+
+	| history commandExecutor parent child1 child2 child3 |
+	
+	parent := BlElement new.
+	child1 := BlElement new.
+	child2 := BlElement new.
+	child3 := BlElement new.
+	parent addChild: child1.
+	parent addChild: child2.
+	parent addChild: child3.
+	
+	history := PyramidHistory new.
+	commandExecutor := PyramidHistoryCommandExecutor new
+		                   history: history;
+		                   wrappee: PyramidMainCommandExecutor new;
+		                   yourself. 
+		
+	commandExecutor
+		use: PyramidRemoveSelectedElementsCommand new
+		on: { child2 }
+		with: { parent }.
+		
+	self deny: (parent children includes: child2). 
+	
+	"Undo"
+	history undo.
+	
+	self assert: (parent children includes: child2).
+	self assert: (parent children indexOf: child2) equals: 2. 
+	
+	"Redo"
+	history redo.
+	
+	self deny: (parent children includes: child2). 
+	
+	"Undo"
+	history undo.
+	
+	self assert: (parent children includes: child2).
+	self assert: (parent children indexOf: child2) equals: 2
+]
diff --git a/src/Pyramid-Toplo/PyramidStampCommand.class.st b/src/Pyramid-Toplo/PyramidStampCommand.class.st
index 2ec2f0c..7bfb575 100644
--- a/src/Pyramid-Toplo/PyramidStampCommand.class.st
+++ b/src/Pyramid-Toplo/PyramidStampCommand.class.st
@@ -7,13 +7,13 @@ Class {
 	#category : #'Pyramid-Toplo-plugin-theme-management'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidStampCommand >> getValueFor: anObject [
 
 	^ anObject hasStamp:  self stamp
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidStampCommand >> setValueFor: anObject with: aBoolean [
 
 	aBoolean
diff --git a/src/Pyramid-Toplo/PyramidThemeCommand.class.st b/src/Pyramid-Toplo/PyramidThemeCommand.class.st
index 66c4f82..d26dcdc 100644
--- a/src/Pyramid-Toplo/PyramidThemeCommand.class.st
+++ b/src/Pyramid-Toplo/PyramidThemeCommand.class.st
@@ -4,13 +4,13 @@ Class {
 	#category : #'Pyramid-Toplo-plugin-theme-management'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidThemeCommand >> getValueFor: anObject [
 
 	^ anObject localTheme
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidThemeCommand >> setValueFor: anObject with: nilOrToTheme [
 
 	anObject localTheme: nilOrToTheme
diff --git a/src/Pyramid/PyramidAddAllToCollectionCommand.class.st b/src/Pyramid/PyramidAddAllToCollectionCommand.class.st
index b4a0224..5bc12e9 100644
--- a/src/Pyramid/PyramidAddAllToCollectionCommand.class.st
+++ b/src/Pyramid/PyramidAddAllToCollectionCommand.class.st
@@ -4,19 +4,19 @@ Class {
 	#category : #'Pyramid-commands'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidAddAllToCollectionCommand >> commandInverse [
 
 	^ PyramidRemoveAllFromCollectionCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidAddAllToCollectionCommand >> getValueFor: anObject [
 
 	^ nil
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidAddAllToCollectionCommand >> setValueFor: anObject with: anArgument [
 
 	anObject addAll: anArgument
diff --git a/src/Pyramid/PyramidAddToCollectionCommand.class.st b/src/Pyramid/PyramidAddToCollectionCommand.class.st
index c1eb537..fdf034e 100644
--- a/src/Pyramid/PyramidAddToCollectionCommand.class.st
+++ b/src/Pyramid/PyramidAddToCollectionCommand.class.st
@@ -4,19 +4,19 @@ Class {
 	#category : #'Pyramid-commands'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidAddToCollectionCommand >> commandInverse [
 
 	^ PyramidRemoveFromCollectionCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidAddToCollectionCommand >> getValueFor: anObject [
 
 	^ nil
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidAddToCollectionCommand >> setValueFor: anObject with: anArgument [
 
 	anObject add: anArgument
diff --git a/src/Pyramid/PyramidCollectionCommand.class.st b/src/Pyramid/PyramidCollectionCommand.class.st
index 3a22527..c570001 100644
--- a/src/Pyramid/PyramidCollectionCommand.class.st
+++ b/src/Pyramid/PyramidCollectionCommand.class.st
@@ -16,7 +16,7 @@ PyramidCollectionCommand >> canBeUsedFor: anObject [
 	^ anObject isCollection
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #private }
 PyramidCollectionCommand >> saveStatesOf: aCollection withCommand: aCommand withArguments: anArguments [
 
 	| mementos |
diff --git a/src/Pyramid/PyramidCommand.class.st b/src/Pyramid/PyramidCommand.class.st
index 4bf754c..46b6692 100644
--- a/src/Pyramid/PyramidCommand.class.st
+++ b/src/Pyramid/PyramidCommand.class.st
@@ -27,7 +27,7 @@ PyramidCommand >> canBeUsedFor: anObject [
 	^ self shouldBeImplemented
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #actions }
 PyramidCommand >> clusterOf: aCollection [
 
 	| users cluster |
@@ -40,25 +40,25 @@ PyramidCommand >> clusterOf: aCollection [
 	^ cluster
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidCommand >> commandInverse [
 
 	^ self
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidCommand >> getGroupedValueFor: anObject [
 
 	^ self getValueFor: anObject
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidCommand >> getValueFor: anObject [
 
 	^ self shouldBeImplemented
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidCommand >> saveStatesOf: aCollection with: arguments [
 
 	^ self
@@ -67,7 +67,7 @@ PyramidCommand >> saveStatesOf: aCollection with: arguments [
 		  withArguments: arguments
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #private }
 PyramidCommand >> saveStatesOf: aCollection withCommand: aCommand withArguments: anArguments [
 
 	| mementos |
@@ -83,19 +83,19 @@ PyramidCommand >> saveStatesOf: aCollection withCommand: aCommand withArguments:
 		  yourself
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidCommand >> saveStatesWithCommandInverseOf: aCollection with: arguments [
 
 	^ self saveStatesOf: aCollection withCommand: self commandInverse withArguments: arguments
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidCommand >> setValueFor: anObject with: anArgument [
 
 	self shouldBeImplemented
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #actions }
 PyramidCommand >> useOn: aCollection with: anArgument [
 
 	aCollection do: [ :each | self setValueFor: each with: anArgument ]
diff --git a/src/Pyramid/PyramidCompositeMemento.class.st b/src/Pyramid/PyramidCompositeMemento.class.st
index f3eb07f..8ec7456 100644
--- a/src/Pyramid/PyramidCompositeMemento.class.st
+++ b/src/Pyramid/PyramidCompositeMemento.class.st
@@ -34,5 +34,10 @@ PyramidCompositeMemento >> mementos: anObject [
 { #category : #'window management' }
 PyramidCompositeMemento >> restore [
 
-	self mementos do: [ :each | each restore ]
+	(self mementos allSatisfy: [ :m | m arguments isKindOf: BlElement ])
+		ifFalse: [ self mementos do: [ :each | each restore ]. ^ self ].
+	(self mementos asSortedCollection: [ :a :b |
+			 (a arguments userData at: #removedAtIndex ifAbsent: [ 0 ])
+			 < (b arguments userData at: #removedAtIndex ifAbsent: [ 0 ]) ])
+		do: [ :each | each restore ]
 ]
diff --git a/src/Pyramid/PyramidRemoveAllFromCollectionCommand.class.st b/src/Pyramid/PyramidRemoveAllFromCollectionCommand.class.st
index e039ab4..91c4cb8 100644
--- a/src/Pyramid/PyramidRemoveAllFromCollectionCommand.class.st
+++ b/src/Pyramid/PyramidRemoveAllFromCollectionCommand.class.st
@@ -4,19 +4,19 @@ Class {
 	#category : #'Pyramid-commands'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidRemoveAllFromCollectionCommand >> commandInverse [
 
 	^ PyramidAddAllToCollectionCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidRemoveAllFromCollectionCommand >> getValueFor: anObject [
 
 	^ nil
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidRemoveAllFromCollectionCommand >> setValueFor: anObject with: anArgument [
 
 	anObject removeAll: anArgument
diff --git a/src/Pyramid/PyramidRemoveFromCollectionCommand.class.st b/src/Pyramid/PyramidRemoveFromCollectionCommand.class.st
index cf9386a..56c0aaf 100644
--- a/src/Pyramid/PyramidRemoveFromCollectionCommand.class.st
+++ b/src/Pyramid/PyramidRemoveFromCollectionCommand.class.st
@@ -4,19 +4,19 @@ Class {
 	#category : #'Pyramid-commands'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #history }
 PyramidRemoveFromCollectionCommand >> commandInverse [
 
 	^ PyramidAddToCollectionCommand new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #getter }
 PyramidRemoveFromCollectionCommand >> getValueFor: anObject [
 
 	^ nil
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #setter }
 PyramidRemoveFromCollectionCommand >> setValueFor: anObject with: anArgument [
 
 	anObject remove: anArgument