diff --git a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st
index 44fda0b..fcbff38 100644
--- a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st
+++ b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st
@@ -1,12 +1,10 @@
 baselines
 baseline: spec
   <baseline>
+
   spec
     for: #'common'
     do: [
-      spec
-        baseline: 'Ston'
-        with: [ spec repository: 'github://svenvc/ston/repository' ].
       spec
         package: 'Parasol-Core';
         package: 'Parasol-Seaside' with: [ spec requires: #('Parasol-Core') ];
@@ -17,6 +15,7 @@ baseline: spec
         group: 'default' with: #('Parasol-Seaside' 'Parasol-Convenience');
         group: 'core' with: #('Parasol-Core' 'Parasol-Convenience');
         group: 'tests' with: #('Parasol-Tests' 'default') ].
+
   spec
     for: #'loadSeaside'
     do: [
@@ -42,20 +41,25 @@ baseline: spec
       spec
         package: 'Parasol-Squeak';
         package: 'Parasol-Core' with: [ spec includes: #('Parasol-Squeak') ] ].
+
   spec
     for: #(#'pharo6.x' #'pharo7.x' #'pharo8.x')
     do: [
       spec
-        package: 'Parasol-Pharo'
-          with: [ spec requires: #('Parasol-Core' 'Ston') ];
-        package: 'Parasol-Core' with: [ spec includes: #('Parasol-Pharo') ] ].
+			package: 'Parasol-Pharo'
+				with: [ spec requires: #('Parasol-Core') ];
+			package: 'Parasol-Core'
+				with: [ spec includes: #('Parasol-Pharo') ] ].
+
   spec
     for: #('pharo9.x' 'pharo10.x' 'pharo11.x' 'pharo12.x' 'pharo13.x')
     do: [
       spec
-        package: 'Parasol-Pharo9'
-          with: [ spec requires: #('Parasol-Core' 'Ston') ];
-        package: 'Parasol-Core' with: [ spec includes: #('Parasol-Pharo9') ] ].
+			package: 'Parasol-Pharo9'
+				with: [ spec requires: #('Parasol-Core') ];
+			package: 'Parasol-Core' 
+				with: [ spec includes: #('Parasol-Pharo9') ] ].
+
   spec
     for: #'gemstone'
     do: [
@@ -67,16 +71,7 @@ baseline: spec
               spec
                 includes: #('Parasol-GemStone');
                 requires: #('ZincHTTP') ] ].
-  spec
-    for: #'gs2.4.x'
-    do: [
-      spec
-        baseline: 'ZincHTTP'
-        with: [
-          spec
-            className: 'BaselineOfZinc';
-            loads: 'Core';
-            repository: 'github://GsDevKit/zinc:2.3.2_gs2.4/repository' ] ].
+
   spec
     for: #'gs3.x'
     do: [
diff --git a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/projectClass.st b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/projectClass.st
index 1d4f656..430260f 100644
--- a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/projectClass.st
+++ b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/projectClass.st
@@ -1,4 +1,5 @@
 accessing
 projectClass
+
   Smalltalk at: #'MetacelloCypressBaselineProject' ifPresent: [ :cl | ^ cl ].
   ^ super projectClass
\ No newline at end of file
diff --git a/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonRead..st b/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonRead..st
index 896d7eb..77dd072 100644
--- a/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonRead..st
+++ b/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonRead..st
@@ -1,3 +1,4 @@
 facade
-jsonRead: aString
-	self subclassResponsibility
\ No newline at end of file
+jsonRead: aString 
+
+	^ WAJsonParser parse: aString
\ No newline at end of file
diff --git a/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonWrite..st b/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonWrite..st
index 182eddd..5df4ff0 100644
--- a/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonWrite..st
+++ b/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonWrite..st
@@ -1,3 +1,4 @@
 facade
-jsonWrite: aDictionary
-	self subclassResponsibility
\ No newline at end of file
+jsonWrite: anObject
+
+	^ anObject asJson
\ No newline at end of file
diff --git a/repository/Parasol-GemStone.package/.filetree b/repository/Parasol-GemStone.package/.filetree
index 8998102..57a6797 100644
--- a/repository/Parasol-GemStone.package/.filetree
+++ b/repository/Parasol-GemStone.package/.filetree
@@ -1,4 +1,5 @@
 {
-	"noMethodMetaData" : true,
 	"separateMethodMetaAndSource" : false,
-	"useCypressPropertiesFile" : true }
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}
\ No newline at end of file
diff --git a/repository/Parasol-GemStone.package/Array.extension/properties.json b/repository/Parasol-GemStone.package/Array.extension/properties.json
index 1070c08..e992470 100644
--- a/repository/Parasol-GemStone.package/Array.extension/properties.json
+++ b/repository/Parasol-GemStone.package/Array.extension/properties.json
@@ -1,2 +1,3 @@
 {
-	"name" : "Array" }
+	"name" : "Array"
+}
\ No newline at end of file
diff --git a/repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonRead..st b/repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonRead..st
deleted file mode 100644
index 68847a4..0000000
--- a/repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonRead..st
+++ /dev/null
@@ -1,3 +0,0 @@
-facade
-jsonRead: aString 
-	^JSJsonParser parse: aString
\ No newline at end of file
diff --git a/repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonWrite..st b/repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonWrite..st
deleted file mode 100644
index c0027a8..0000000
--- a/repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonWrite..st
+++ /dev/null
@@ -1,4 +0,0 @@
-facade
-jsonWrite: anObject
-
-	^anObject asJson
\ No newline at end of file
diff --git a/repository/Parasol-GemStone.package/BPGemStonePlatform.class/properties.json b/repository/Parasol-GemStone.package/BPGemStonePlatform.class/properties.json
index 3029b40..d14fc7a 100644
--- a/repository/Parasol-GemStone.package/BPGemStonePlatform.class/properties.json
+++ b/repository/Parasol-GemStone.package/BPGemStonePlatform.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "Parasol-GemStone",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "BPGemStonePlatform",
-	"pools" : [
-		 ],
 	"super" : "BPSmalltalkPlatform",
-	"type" : "normal" }
+	"category" : "Parasol-GemStone",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "BPGemStonePlatform",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/Parasol-GemStone.package/ByteArray.extension/properties.json b/repository/Parasol-GemStone.package/ByteArray.extension/properties.json
index 191a2ec..f81bcb8 100644
--- a/repository/Parasol-GemStone.package/ByteArray.extension/properties.json
+++ b/repository/Parasol-GemStone.package/ByteArray.extension/properties.json
@@ -1,2 +1,3 @@
 {
-	"name" : "ByteArray" }
+	"name" : "ByteArray"
+}
\ No newline at end of file
diff --git a/repository/Parasol-GemStone.package/CharacterCollection.extension/properties.json b/repository/Parasol-GemStone.package/CharacterCollection.extension/properties.json
index c85a513..e950445 100644
--- a/repository/Parasol-GemStone.package/CharacterCollection.extension/properties.json
+++ b/repository/Parasol-GemStone.package/CharacterCollection.extension/properties.json
@@ -1,2 +1,3 @@
 {
-	"name" : "CharacterCollection" }
+	"name" : "CharacterCollection"
+}
\ No newline at end of file
diff --git a/repository/Parasol-GemStone.package/Collection.extension/properties.json b/repository/Parasol-GemStone.package/Collection.extension/properties.json
index 93b0dc3..48f9f8d 100644
--- a/repository/Parasol-GemStone.package/Collection.extension/properties.json
+++ b/repository/Parasol-GemStone.package/Collection.extension/properties.json
@@ -1,2 +1,3 @@
 {
-	"name" : "Collection" }
+	"name" : "Collection"
+}
\ No newline at end of file
diff --git a/repository/Parasol-GemStone.package/monticello.meta/categories.st b/repository/Parasol-GemStone.package/monticello.meta/categories.st
index 847fda3..946896b 100644
--- a/repository/Parasol-GemStone.package/monticello.meta/categories.st
+++ b/repository/Parasol-GemStone.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #'Parasol-GemStone'!
+self packageOrganizer ensurePackage: #'Parasol-GemStone' withTags: #()!
diff --git a/repository/Parasol-GemStone.package/properties.json b/repository/Parasol-GemStone.package/properties.json
index f037444..6f31cf5 100644
--- a/repository/Parasol-GemStone.package/properties.json
+++ b/repository/Parasol-GemStone.package/properties.json
@@ -1,2 +1 @@
-{
-	 }
+{ }
\ No newline at end of file
diff --git a/repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonRead..st b/repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonRead..st
deleted file mode 100644
index 7a702fa..0000000
--- a/repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonRead..st
+++ /dev/null
@@ -1,4 +0,0 @@
-facade
-jsonRead: aString 
-
-	^ STONJSON fromString: aString
diff --git a/repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonWrite..st b/repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonWrite..st
deleted file mode 100644
index 5997d40..0000000
--- a/repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonWrite..st
+++ /dev/null
@@ -1,4 +0,0 @@
-facade
-jsonWrite: anObject
-
-	^ STONJSON toString: anObject
diff --git a/repository/Parasol-Pharo9.package/monticello.meta/categories.st b/repository/Parasol-Pharo9.package/monticello.meta/categories.st
index 0b83780..2a3c0a7 100644
--- a/repository/Parasol-Pharo9.package/monticello.meta/categories.st
+++ b/repository/Parasol-Pharo9.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #'Parasol-Pharo9'!
+self packageOrganizer ensurePackage: #'Parasol-Pharo9' withTags: #()!
diff --git a/repository/Parasol-Squeak.package/.filetree b/repository/Parasol-Squeak.package/.filetree
index 8998102..57a6797 100644
--- a/repository/Parasol-Squeak.package/.filetree
+++ b/repository/Parasol-Squeak.package/.filetree
@@ -1,4 +1,5 @@
 {
-	"noMethodMetaData" : true,
 	"separateMethodMetaAndSource" : false,
-	"useCypressPropertiesFile" : true }
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}
\ No newline at end of file
diff --git a/repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonRead..st b/repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonRead..st
deleted file mode 100644
index 68847a4..0000000
--- a/repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonRead..st
+++ /dev/null
@@ -1,3 +0,0 @@
-facade
-jsonRead: aString 
-	^JSJsonParser parse: aString
\ No newline at end of file
diff --git a/repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonWrite..st b/repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonWrite..st
deleted file mode 100644
index c0027a8..0000000
--- a/repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonWrite..st
+++ /dev/null
@@ -1,4 +0,0 @@
-facade
-jsonWrite: anObject
-
-	^anObject asJson
\ No newline at end of file
diff --git a/repository/Parasol-Squeak.package/BPSqueakPlatform.class/properties.json b/repository/Parasol-Squeak.package/BPSqueakPlatform.class/properties.json
index c140a7d..fb58ccc 100644
--- a/repository/Parasol-Squeak.package/BPSqueakPlatform.class/properties.json
+++ b/repository/Parasol-Squeak.package/BPSqueakPlatform.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "Parasol-Squeak",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "BPSqueakPlatform",
-	"pools" : [
-		 ],
 	"super" : "BPSmalltalkPlatform",
-	"type" : "normal" }
+	"category" : "Parasol-Squeak",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "BPSqueakPlatform",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/Parasol-Squeak.package/monticello.meta/categories.st b/repository/Parasol-Squeak.package/monticello.meta/categories.st
index 264032e..0ad832d 100644
--- a/repository/Parasol-Squeak.package/monticello.meta/categories.st
+++ b/repository/Parasol-Squeak.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #'Parasol-Squeak'!
+self packageOrganizer ensurePackage: #'Parasol-Squeak' withTags: #()!
diff --git a/repository/Parasol-Squeak.package/properties.json b/repository/Parasol-Squeak.package/properties.json
index f037444..6f31cf5 100644
--- a/repository/Parasol-Squeak.package/properties.json
+++ b/repository/Parasol-Squeak.package/properties.json
@@ -1,2 +1 @@
-{
-	 }
+{ }
\ No newline at end of file