diff --git a/.baseline-metadata.ston b/.baseline-metadata.ston
new file mode 100644
index 000000000..fbff05e7a
--- /dev/null
+++ b/.baseline-metadata.ston
@@ -0,0 +1,11 @@
+{
+	"repositories" : {
+		"github://feenkcom/gtoolkit-notifications/src" : "v0.7.116",
+		"github://feenkcom/gtoolkit-utility/src" : "v0.9.43",
+		"github://feenkcom/pharo-futures/src" : "v0.6.161",
+		"github://feenkcom/gtoolkit-pager/src" : "v0.9.138",
+		"github://feenkcom/gt4magritte/src" : "v0.7.119",
+		"github://feenkcom/gtoolkit-editor/src" : "v0.6.37",
+		"github://feenkcom/gtoolkit-completer/src" : "v0.9.118"
+	}
+}
\ No newline at end of file
diff --git a/src/BaselineOfGToolkitCoder/BaselineOfGToolkitCoder.class.st b/src/BaselineOfGToolkitCoder/BaselineOfGToolkitCoder.class.st
index 8cabac53a..ce35eddbc 100644
--- a/src/BaselineOfGToolkitCoder/BaselineOfGToolkitCoder.class.st
+++ b/src/BaselineOfGToolkitCoder/BaselineOfGToolkitCoder.class.st
@@ -31,55 +31,53 @@ Class {
 { #category : #baseline }
 BaselineOfGToolkitCoder >> baseline: spec [
 	<baseline>
-	spec
-		for: #common
-		do: [ spec
-				baseline: 'Futures'
-					with: [ spec repository: 'github://feenkcom/pharo-futures:main/src' ];
-				baseline: 'GToolkitBasicUtility'
-					with: [ spec repository: 'github://feenkcom/gtoolkit-utility:main/src' ];
-				baseline: 'GToolkitAnnouncerUtility'
-					with: [ spec repository: 'github://feenkcom/gtoolkit-utility:main/src' ];
-				baseline: 'GToolkitNotifications'
-					with: [ spec repository: 'github://feenkcom/gtoolkit-notifications:main/src' ];
-				baseline: 'GToolkitPager'
-					with: [ spec repository: 'github://feenkcom/gtoolkit-pager:main/src' ];
-				baseline: 'GToolkitCompleter'
-					with: [ spec repository: 'github://feenkcom/gtoolkit-completer:main/src' ];
-				baseline: 'GToolkit4Magritte'
-					with: [ spec repository: 'github://feenkcom/gt4magritte:main/src' ];
-				baseline: 'GToolkitEditor'
-					with: [ spec repository: 'github://feenkcom/gtoolkit-editor:main/src' ].
+	spec for: #'common' do: [
+		spec
+			baseline: 'Futures' with: [
+				spec repository: 'github://feenkcom/pharo-futures:v0.6.161/src' ].
+		spec
+			baseline: 'GToolkitBasicUtility' with: [
+				spec repository: 'github://feenkcom/gtoolkit-utility:v0.9.43/src' ].
+		spec
+			baseline: 'GToolkitAnnouncerUtility' with: [
+				spec repository: 'github://feenkcom/gtoolkit-utility:v0.9.43/src' ].
+		spec
+			baseline: 'GToolkitNotifications' with: [
+				spec repository: 'github://feenkcom/gtoolkit-notifications:v0.7.116/src' ].
+		spec
+			baseline: 'GToolkitPager' with: [
+				spec repository: 'github://feenkcom/gtoolkit-pager:v0.9.138/src' ].
+		spec
+			baseline: 'GToolkitCompleter' with: [
+				spec repository: 'github://feenkcom/gtoolkit-completer:v0.9.118/src' ].
+		spec
+			baseline: 'GToolkit4Magritte' with: [
+				spec repository: 'github://feenkcom/gt4magritte:v0.7.119/src' ].
+		spec
+			baseline: 'GToolkitEditor' with: [
+				spec repository: 'github://feenkcom/gtoolkit-editor:v0.6.37/src' ].
 
-			spec
-				package: 'GToolkit-VariableBindings';
-				package: 'GToolkit-SearchFilters' with: [ spec requires: #('Futures') ];
-				package: 'GToolkit-SearchFilters-PhlowTool'
-					with: [ spec requires: #('GToolkit-SearchFilters' 'GToolkitPager') ];
-				package: 'GToolkit-Coder-StreamingCoders'
-					with: [ spec requires: #('Futures' 'GToolkit-SearchFilters') ];
-				package: 'GToolkit-Coder-StreamingCoders-UI'
-					with: [ spec requires: #('Futures' 'GToolkit-Coder-StreamingCoders') ];
-				package: 'GToolkit-Coder'
-					with: [ spec
-							requires: #('Futures' 'GToolkitBasicUtility' 'GToolkitAnnouncerUtility' 'GToolkitPager' 'GToolkitCompleter' 'GToolkit-SearchFilters') ];
-				package: 'GToolkit-Coder-UI'
-					with: [ spec
-							requires: #('GToolkit-Coder' 'GToolkit-VariableBindings' 'GToolkitBasicUtility' 'GToolkitPager' 'GToolkitNotifications' 'GToolkit4Magritte' 'GToolkitEditor') ];
-				package: 'GToolkit-Coder-AddOns'
-					with: [ spec requires: #('GToolkit-Coder' 'GToolkit-Coder-UI') ];
-				package: 'GToolkit-Coder-Extensions'
-					with: [ spec requires: #('GToolkit-Coder' 'GToolkit-Coder-UI' 'GToolkit-Coder-AddOns') ];
-				package: 'GToolkit-Coder-Examples-SystemS1';
-				package: 'GToolkit-Coder-Examples'
-					with: [ spec
-							requires: #('GToolkit-Coder' 'GToolkit-Coder-UI' 'GToolkit-Coder-AddOns' 'GToolkit-Coder-Examples-SystemS1' 'GToolkit4Magritte') ].
-							
-			self 
-				forPharo13AndNewer: [] 
-				forOlder: [
-					spec package: 'GToolkit-Coder-Pharo12Extensions' with: [ 
-						spec requires: #('GToolkit-Coder-Extensions') ] ]
-							
-		]
+		spec package: 'GToolkit-VariableBindings'.
+		spec package: 'GToolkit-SearchFilters' with: [
+			spec requires: #(#Futures) ].
+		spec package: 'GToolkit-SearchFilters-PhlowTool' with: [
+			spec requires: #(#'GToolkit-SearchFilters' #GToolkitPager) ].
+		spec package: 'GToolkit-Coder-StreamingCoders' with: [
+			spec requires: #(#Futures #'GToolkit-SearchFilters') ].
+		spec package: 'GToolkit-Coder-StreamingCoders-UI' with: [
+			spec requires: #(#Futures #'GToolkit-Coder-StreamingCoders') ].
+		spec package: 'GToolkit-Coder' with: [
+			spec requires: #(#Futures #GToolkitBasicUtility #GToolkitAnnouncerUtility #GToolkitPager #GToolkitCompleter #'GToolkit-SearchFilters') ].
+		spec package: 'GToolkit-Coder-UI' with: [
+			spec requires: #(#'GToolkit-Coder' #'GToolkit-VariableBindings' #GToolkitBasicUtility #GToolkitPager #GToolkitNotifications #GToolkit4Magritte #GToolkitEditor) ].
+		spec package: 'GToolkit-Coder-AddOns' with: [
+			spec requires: #(#'GToolkit-Coder' #'GToolkit-Coder-UI') ].
+		spec package: 'GToolkit-Coder-Extensions' with: [
+			spec requires: #(#'GToolkit-Coder' #'GToolkit-Coder-UI' #'GToolkit-Coder-AddOns') ].
+		spec package: 'GToolkit-Coder-Examples-SystemS1'.
+		spec package: 'GToolkit-Coder-Examples' with: [
+			spec requires: #(#'GToolkit-Coder' #'GToolkit-Coder-UI' #'GToolkit-Coder-AddOns' #'GToolkit-Coder-Examples-SystemS1' #GToolkit4Magritte) ].
+		spec package: 'GToolkit-Coder-Pharo12Extensions' with: [
+			spec requires: #(#'GToolkit-Coder-Extensions') ].
+	]
 ]
diff --git a/src/GToolkit-VariableBindings/GtCompositeVariablesBindings.class.st b/src/GToolkit-VariableBindings/GtCompositeVariablesBindings.class.st
index fc8094c5f..ed057ddb4 100644
--- a/src/GToolkit-VariableBindings/GtCompositeVariablesBindings.class.st
+++ b/src/GToolkit-VariableBindings/GtCompositeVariablesBindings.class.st
@@ -6,7 +6,7 @@ Class {
 	#instVars : [
 		'bindings'
 	],
-	#category : #'GToolkit-VariableBindings-Bindings'
+	#category : 'GToolkit-VariableBindings-Bindings'
 }
 
 { #category : #comparing }
diff --git a/src/GToolkit-VariableBindings/GtEmptyVariablesBindings.class.st b/src/GToolkit-VariableBindings/GtEmptyVariablesBindings.class.st
index a9bc2c770..ef15a7ad2 100644
--- a/src/GToolkit-VariableBindings/GtEmptyVariablesBindings.class.st
+++ b/src/GToolkit-VariableBindings/GtEmptyVariablesBindings.class.st
@@ -3,7 +3,7 @@ Class {
 	#superclass : #Object,
 	#traits : 'TGtVariablesBindings',
 	#classTraits : 'TGtVariablesBindings classTrait',
-	#category : #'GToolkit-VariableBindings-Bindings'
+	#category : 'GToolkit-VariableBindings-Bindings'
 }
 
 { #category : #comparing }
diff --git a/src/GToolkit-VariableBindings/GtGlobalVariablesBindings.class.st b/src/GToolkit-VariableBindings/GtGlobalVariablesBindings.class.st
index ea5160296..78739860b 100644
--- a/src/GToolkit-VariableBindings/GtGlobalVariablesBindings.class.st
+++ b/src/GToolkit-VariableBindings/GtGlobalVariablesBindings.class.st
@@ -3,7 +3,7 @@ Class {
 	#superclass : #Object,
 	#traits : 'TGtVariablesBindings',
 	#classTraits : 'TGtVariablesBindings classTrait',
-	#category : #'GToolkit-VariableBindings-Bindings'
+	#category : 'GToolkit-VariableBindings-Bindings'
 }
 
 { #category : #comparing }