diff --git a/src/System-Platforms/KeyboardKey.class.st b/src/System-Platforms/KeyboardKey.class.st
index 1408aec8875..6af1aa18573 100644
--- a/src/System-Platforms/KeyboardKey.class.st
+++ b/src/System-Platforms/KeyboardKey.class.st
@@ -14,7 +14,7 @@ Class {
 		'UnixVirtualKeyTable',
 		'WindowsVirtualKeyTable'
 	],
-	#category : #'System-Platforms'
+	#category : #'System-Platforms-Utilities'
 }
 
 { #category : #'class initialization' }
@@ -661,7 +661,7 @@ KeyboardKey >> printOn: aStream [
 		nextPutAll: name;
 		nextPutAll: ' code: (';
 		nextPutAll: value asString;
-		nextPutAll: ')'.
+		nextPutAll: ')'
 ]
 
 { #category : #'initialize-release' }
diff --git a/src/System-Platforms/MacOSPlatform.class.st b/src/System-Platforms/MacOSPlatform.class.st
index 864257a9d53..1d512bad24c 100644
--- a/src/System-Platforms/MacOSPlatform.class.st
+++ b/src/System-Platforms/MacOSPlatform.class.st
@@ -5,7 +5,7 @@ I am a an object representing a Mac OS (pre OSX) platform. Use myself to access
 Class {
 	#name : #MacOSPlatform,
 	#superclass : #OSPlatform,
-	#category : #'System-Platforms'
+	#category : #'System-Platforms-Mac'
 }
 
 { #category : #testing }
diff --git a/src/System-Platforms/MacOSXPlatform.class.st b/src/System-Platforms/MacOSXPlatform.class.st
index 719844cbb50..38576890932 100644
--- a/src/System-Platforms/MacOSXPlatform.class.st
+++ b/src/System-Platforms/MacOSXPlatform.class.st
@@ -10,7 +10,7 @@ OSPlatform current.
 Class {
 	#name : #MacOSXPlatform,
 	#superclass : #MacOSPlatform,
-	#category : #'System-Platforms'
+	#category : #'System-Platforms-Mac'
 }
 
 { #category : #testing }
diff --git a/src/System-Platforms/ManifestSystemPlatforms.class.st b/src/System-Platforms/ManifestSystemPlatforms.class.st
index c2954c0d661..72f039ad208 100644
--- a/src/System-Platforms/ManifestSystemPlatforms.class.st
+++ b/src/System-Platforms/ManifestSystemPlatforms.class.st
@@ -1,7 +1,10 @@
+"
+Support for different OS platforms
+"
 Class {
 	#name : #ManifestSystemPlatforms,
 	#superclass : #PackageManifest,
-	#category : #'System-Platforms'
+	#category : #'System-Platforms-Manifest'
 }
 
 { #category : #'meta-data - dependency analyser' }
diff --git a/src/System-Platforms/OSPlatform.class.st b/src/System-Platforms/OSPlatform.class.st
index 08d562daa0f..e54c961abb7 100644
--- a/src/System-Platforms/OSPlatform.class.st
+++ b/src/System-Platforms/OSPlatform.class.st
@@ -14,7 +14,7 @@ Class {
 	#classVars : [
 		'Current'
 	],
-	#category : #'System-Platforms'
+	#category : #'System-Platforms-Base'
 }
 
 { #category : #accessing }
@@ -45,7 +45,13 @@ OSPlatform class >> determineActivePlatform [
 
 ]
 
-{ #category : #'initialize-release' }
+{ #category : #example }
+OSPlatform class >> example [
+	<example>
+	Smalltalk os current inspect
+]
+
+{ #category : #'class initialization' }
 OSPlatform class >> initialize [
 	"OSPlatform initialize"
 
diff --git a/src/System-Platforms/Unix32Platform.class.st b/src/System-Platforms/Unix32Platform.class.st
index 66f8e5d363d..902558556c0 100644
--- a/src/System-Platforms/Unix32Platform.class.st
+++ b/src/System-Platforms/Unix32Platform.class.st
@@ -4,7 +4,7 @@ urce: 22651600
 Class {
 	#name : #Unix32Platform,
 	#superclass : #UnixPlatform,
-	#category : #'System-Platforms'
+	#category : #'System-Platforms-Unix'
 }
 
 { #category : #testing }
diff --git a/src/System-Platforms/Unix64Platform.class.st b/src/System-Platforms/Unix64Platform.class.st
index 5e1cdee937a..ad36f3438ca 100644
--- a/src/System-Platforms/Unix64Platform.class.st
+++ b/src/System-Platforms/Unix64Platform.class.st
@@ -10,7 +10,7 @@ OSPlatform current.
 Class {
 	#name : #Unix64Platform,
 	#superclass : #UnixPlatform,
-	#category : #'System-Platforms'
+	#category : #'System-Platforms-Unix'
 }
 
 { #category : #testing }
diff --git a/src/System-Platforms/UnixPlatform.class.st b/src/System-Platforms/UnixPlatform.class.st
index ae5855034d1..7499009d8e2 100644
--- a/src/System-Platforms/UnixPlatform.class.st
+++ b/src/System-Platforms/UnixPlatform.class.st
@@ -10,7 +10,7 @@ OSPlatform current.
 Class {
 	#name : #UnixPlatform,
 	#superclass : #OSPlatform,
-	#category : #'System-Platforms'
+	#category : #'System-Platforms-Unix'
 }
 
 { #category : #testing }
diff --git a/src/System-Platforms/Win32Platform.class.st b/src/System-Platforms/Win32Platform.class.st
index 332e17b4959..99135ffebd1 100644
--- a/src/System-Platforms/Win32Platform.class.st
+++ b/src/System-Platforms/Win32Platform.class.st
@@ -11,7 +11,7 @@ OSPlatform current.
 Class {
 	#name : #Win32Platform,
 	#superclass : #WinPlatform,
-	#category : #'System-Platforms'
+	#category : #'System-Platforms-Windows'
 }
 
 { #category : #testing }
diff --git a/src/System-Platforms/Win64Platform.class.st b/src/System-Platforms/Win64Platform.class.st
index 0a087339ff3..fc1bae32202 100644
--- a/src/System-Platforms/Win64Platform.class.st
+++ b/src/System-Platforms/Win64Platform.class.st
@@ -11,7 +11,7 @@ OSPlatform current.
 Class {
 	#name : #Win64Platform,
 	#superclass : #WinPlatform,
-	#category : #'System-Platforms'
+	#category : #'System-Platforms-Windows'
 }
 
 { #category : #testing }
diff --git a/src/System-Platforms/WinPlatform.class.st b/src/System-Platforms/WinPlatform.class.st
index babe41537bf..1408b3bb6ef 100644
--- a/src/System-Platforms/WinPlatform.class.st
+++ b/src/System-Platforms/WinPlatform.class.st
@@ -10,7 +10,7 @@ OSPlatform current.
 Class {
 	#name : #WinPlatform,
 	#superclass : #OSPlatform,
-	#category : #'System-Platforms'
+	#category : #'System-Platforms-Windows'
 }
 
 { #category : #testing }