diff --git a/src/BaselineOfNewTools/BaselineOfNewTools.class.st b/src/BaselineOfNewTools/BaselineOfNewTools.class.st
index 2022b2576..7f4e0e6be 100644
--- a/src/BaselineOfNewTools/BaselineOfNewTools.class.st
+++ b/src/BaselineOfNewTools/BaselineOfNewTools.class.st
@@ -1,13 +1,14 @@
 Class {
-	#name : #BaselineOfNewTools,
-	#superclass : #BaselineOf,
+	#name : 'BaselineOfNewTools',
+	#superclass : 'BaselineOf',
 	#instVars : [
 		'initializersEnabled'
 	],
-	#category : #BaselineOfNewTools
+	#category : 'BaselineOfNewTools',
+	#package : 'BaselineOfNewTools'
 }
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfNewTools >> baseline: spec [
 
 	<baseline>
@@ -144,7 +145,7 @@ BaselineOfNewTools >> baseline: spec [
             					'RewriterTools') ]
 ]
 
-{ #category : #'external projects' }
+{ #category : 'external projects' }
 BaselineOfNewTools >> chest: spec [
 
 	spec baseline: 'Chest' with: [ 
@@ -154,7 +155,7 @@ BaselineOfNewTools >> chest: spec [
 			loads: 'default' ]
 ]
 
-{ #category : #'external projects' }
+{ #category : 'external projects' }
 BaselineOfNewTools >> packageRepositoryURL [
 	| url |
 	
@@ -168,20 +169,20 @@ BaselineOfNewTools >> packageRepositoryURL [
 	^ url
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 BaselineOfNewTools >> postload: loader package: packageSpec [
 
 	MCMethodDefinition initializersEnabled: initializersEnabled
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 BaselineOfNewTools >> preload: loader package: packageSpec [
 
 	initializersEnabled := MCMethodDefinition initializersEnabled.
 	MCMethodDefinition initializersEnabled: true
 ]
 
-{ #category : #'external projects' }
+{ #category : 'external projects' }
 BaselineOfNewTools >> sindarin: spec [
 
 	spec baseline: 'Sindarin' with: [ 
diff --git a/src/BaselineOfNewTools/package.st b/src/BaselineOfNewTools/package.st
index 0c639d564..5c6d87ebb 100644
--- a/src/BaselineOfNewTools/package.st
+++ b/src/BaselineOfNewTools/package.st
@@ -1 +1 @@
-Package { #name : #BaselineOfNewTools }
+Package { #name : 'BaselineOfNewTools' }
diff --git a/src/HelpCenter/HCBrowser.class.st b/src/HelpCenter/HCBrowser.class.st
index ff210e595..7f6870d9c 100644
--- a/src/HelpCenter/HCBrowser.class.st
+++ b/src/HelpCenter/HCBrowser.class.st
@@ -1,14 +1,15 @@
 Class {
-	#name : #HCBrowser,
-	#superclass : #ComposablePresenter,
+	#name : 'HCBrowser',
+	#superclass : 'ComposablePresenter',
 	#instVars : [
 		'listItems',
 		'docReader'
 	],
-	#category : #HelpCenter
+	#category : 'HelpCenter',
+	#package : 'HelpCenter'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 HCBrowser class >> defaultSpec [
 	^SpecRowLayout composed
 		newColumn: [ :col | col add: #listItems ] origin: 0 @ 0 corner: 0.3 @ 1;
@@ -17,38 +18,38 @@ HCBrowser class >> defaultSpec [
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCBrowser >> docReader [
 	^ docReader
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCBrowser >> docReader: anObject [
 	docReader := anObject
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 HCBrowser >> initializePresenter [
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 HCBrowser >> initializeWidgets [
 	listItems := self newList.
 	docReader := self newText.
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCBrowser >> listItems [
 	^ listItems
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCBrowser >> listItems: anObject [
 	listItems := anObject
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 HCBrowser >> title [
 	^'HCBrowser'
 ]
diff --git a/src/HelpCenter/HCCentralPlace.class.st b/src/HelpCenter/HCCentralPlace.class.st
index 2fa5d5580..1d73ac139 100644
--- a/src/HelpCenter/HCCentralPlace.class.st
+++ b/src/HelpCenter/HCCentralPlace.class.st
@@ -1,15 +1,16 @@
 Class {
-	#name : #HCCentralPlace,
-	#superclass : #ComposablePresenter,
+	#name : 'HCCentralPlace',
+	#superclass : 'ComposablePresenter',
 	#instVars : [
 		'menuComponent',
 		'hcbrowserComponent',
 		'hcPharoWebSiteComponent'
 	],
-	#category : #HelpCenter
+	#category : 'HelpCenter',
+	#package : 'HelpCenter'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 HCCentralPlace class >> defaultSpec [ 
 	"menuComponent hcbrowserComponent"
 	^SpecColumnLayout composed
@@ -21,7 +22,7 @@ HCCentralPlace class >> defaultSpec [
 	
 ]
 
-{ #category : #'world menu' }
+{ #category : 'world menu' }
 HCCentralPlace class >> menuCommandOn: aBuilder [
 	<worldMenu>
 	(aBuilder item: #'Help Center')
@@ -33,62 +34,62 @@ HCCentralPlace class >> menuCommandOn: aBuilder [
 		withSeparatorAfter 
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 HCCentralPlace class >> open [
 	<script>
 	
 	self new openWithSpec
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCCentralPlace >> hcPharoWebSiteComponent [
 	^ hcPharoWebSiteComponent
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCCentralPlace >> hcPharoWebSiteComponent: anObject [
 	hcPharoWebSiteComponent := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCCentralPlace >> hcbrowserComponent [
 	^ hcbrowserComponent
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCCentralPlace >> hcbrowserComponent: anObject [
 	hcbrowserComponent := anObject
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 HCCentralPlace >> initialExtent [
 	^ 800@600
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 HCCentralPlace >> initializePresenter [
 
 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 HCCentralPlace >> initializeWidgets [
 	menuComponent := self instantiate: HCMenu. 
 	hcbrowserComponent := self instantiate: HCBrowser.
 	hcPharoWebSiteComponent := self instantiate: HCPharoWebSite.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCCentralPlace >> menuComponent [
 	^ menuComponent
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCCentralPlace >> menuComponent: anObject [
 	menuComponent := anObject
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 HCCentralPlace >> title [ 
 	^'Help Center'
 ]
diff --git a/src/HelpCenter/HCMenu.class.st b/src/HelpCenter/HCMenu.class.st
index cc4ad1c8b..cdfe43105 100644
--- a/src/HelpCenter/HCMenu.class.st
+++ b/src/HelpCenter/HCMenu.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #HCMenu,
-	#superclass : #ComposablePresenter,
+	#name : 'HCMenu',
+	#superclass : 'ComposablePresenter',
 	#instVars : [
 		'buttonManuals',
 		'buttonTutorials',
@@ -8,10 +8,11 @@ Class {
 		'linkBooks',
 		'hcbrowserComponent'
 	],
-	#category : #HelpCenter
+	#category : 'HelpCenter',
+	#package : 'HelpCenter'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 HCMenu class >> defaultSpec [
 	^SpecLayout composed
 		newRow: [ :row | 
@@ -24,52 +25,52 @@ HCMenu class >> defaultSpec [
 		
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCMenu >> buttonManuals [
 	^ buttonManuals
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCMenu >> buttonManuals: anObject [
 	buttonManuals := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCMenu >> buttonProfStef [
 	^ buttonProfStef
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCMenu >> buttonProfStef: anObject [
 	buttonProfStef := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCMenu >> buttonTutorials [
 	^ buttonTutorials
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCMenu >> buttonTutorials: anObject [
 	buttonTutorials := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCMenu >> hcbrowserComponent [
 	^ hcbrowserComponent
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCMenu >> hcbrowserComponent: anObject [
 	hcbrowserComponent := anObject
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 HCMenu >> initializePresenter [ 
 	buttonProfStef action: [ ProfStef go ].
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 HCMenu >> initializeWidgets [ 
 	buttonManuals := self newButton 
 		label: 'Manuals';
@@ -88,17 +89,17 @@ HCMenu >> initializeWidgets [
 		yourself.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCMenu >> linkBooks [
 	^ linkBooks
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCMenu >> linkBooks: anObject [
 	linkBooks := anObject
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 HCMenu >> title [ 
 	^'Menu'
 ]
diff --git a/src/HelpCenter/HCPharoWebSite.class.st b/src/HelpCenter/HCPharoWebSite.class.st
index bda274814..64ec0dc65 100644
--- a/src/HelpCenter/HCPharoWebSite.class.st
+++ b/src/HelpCenter/HCPharoWebSite.class.st
@@ -1,27 +1,28 @@
 Class {
-	#name : #HCPharoWebSite,
-	#superclass : #ComposablePresenter,
+	#name : 'HCPharoWebSite',
+	#superclass : 'ComposablePresenter',
 	#instVars : [
 		'link'
 	],
-	#category : #HelpCenter
+	#category : 'HelpCenter',
+	#package : 'HelpCenter'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 HCPharoWebSite class >> defaultSpec [
 	^SpecRowLayout composed
 		newRow: [ :row | row add: #link ]; 
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 HCPharoWebSite >> initializePresenter [
 
 	"link action: [ WebBrowser openOn: 'https://pharo.org/documentation' ]."
 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 HCPharoWebSite >> initializeWidgets [
 	link := self newLabel.
 	
@@ -31,12 +32,12 @@ HCPharoWebSite >> initializeWidgets [
 		color: self theme selectionTextColor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCPharoWebSite >> link [
 	^ link
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 HCPharoWebSite >> link: anObject [
 	link := anObject
 ]
diff --git a/src/HelpCenter/LabeledImagePresenter.class.st b/src/HelpCenter/LabeledImagePresenter.class.st
index 1a16921da..4b28eb605 100644
--- a/src/HelpCenter/LabeledImagePresenter.class.st
+++ b/src/HelpCenter/LabeledImagePresenter.class.st
@@ -1,35 +1,37 @@
 Class {
-	#name : #LabeledImagePresenter,
-	#superclass : #ComposablePresenter,
+	#name : 'LabeledImagePresenter',
+	#superclass : 'ComposablePresenter',
 	#instVars : [
 		'picture',
 		'caption'
 	],
-	#category : #'HelpCenter-widgets'
+	#category : 'HelpCenter-widgets',
+	#package : 'HelpCenter',
+	#tag : 'widgets'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 LabeledImagePresenter class >> defaultSpec [ 
 	^SpecLayout composed
 		newRow: [ :row | row add: #picture; add: #caption ] origin: 0 @ 0 corner: 1 @ 1;
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LabeledImagePresenter >> caption [
 	^ caption
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LabeledImagePresenter >> caption: anObject [
 	caption := anObject
 ]
 
-{ #category : #initialize }
+{ #category : 'initialize' }
 LabeledImagePresenter >> initializePresenter [
 ]
 
-{ #category : #initialize }
+{ #category : 'initialize' }
 LabeledImagePresenter >> initializeWidgets [ 
 	picture := self newImage.
 	"linkPresenter ?"
@@ -43,17 +45,17 @@ LabeledImagePresenter >> initializeWidgets [
 	picture extent inspect.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LabeledImagePresenter >> picture [
 	^ picture
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LabeledImagePresenter >> picture: anObject [
 	picture := anObject
 ]
 
-{ #category : #initialize }
+{ #category : 'initialize' }
 LabeledImagePresenter >> title [
 	^'LabelImagePresenter'
 ]
diff --git a/src/HelpCenter/package.st b/src/HelpCenter/package.st
index ec6e63fc1..86a8a4d64 100644
--- a/src/HelpCenter/package.st
+++ b/src/HelpCenter/package.st
@@ -1 +1 @@
-Package { #name : #HelpCenter }
+Package { #name : 'HelpCenter' }
diff --git a/src/NewTools-Catalog/StCatalogBrowser.class.st b/src/NewTools-Catalog/StCatalogBrowser.class.st
index 53e06e23c..1668a002f 100644
--- a/src/NewTools-Catalog/StCatalogBrowser.class.st
+++ b/src/NewTools-Catalog/StCatalogBrowser.class.st
@@ -1,14 +1,15 @@
 Class {
-	#name : #StCatalogBrowser,
-	#superclass : #StPresenter,
+	#name : 'StCatalogBrowser',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'list',
 		'description'
 	],
-	#category : #'NewTools-Catalog'
+	#category : 'NewTools-Catalog',
+	#package : 'NewTools-Catalog'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StCatalogBrowser class >> defaultSpec [
 
 	^ SpPanedLayout newHorizontal 
@@ -17,7 +18,7 @@ StCatalogBrowser class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCatalogBrowser >> initializeWidgets [
 	
 	list := self newList.
diff --git a/src/NewTools-Catalog/package.st b/src/NewTools-Catalog/package.st
index caeb18651..dcbcf3ba3 100644
--- a/src/NewTools-Catalog/package.st
+++ b/src/NewTools-Catalog/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Catalog' }
+Package { #name : 'NewTools-Catalog' }
diff --git a/src/NewTools-ChangeSorter/ChangeSorterModel.class.st b/src/NewTools-ChangeSorter/ChangeSorterModel.class.st
index 2fdd2e2cc..38aff060c 100644
--- a/src/NewTools-ChangeSorter/ChangeSorterModel.class.st
+++ b/src/NewTools-ChangeSorter/ChangeSorterModel.class.st
@@ -2,25 +2,26 @@
 A ChangeSorterModel is a model used by Change Sorter UIs for computation
 "
 Class {
-	#name : #ChangeSorterModel,
-	#superclass : #Model,
+	#name : 'ChangeSorterModel',
+	#superclass : 'Model',
 	#classVars : [
 		'ClassDescriptionsMap'
 	],
-	#category : #'NewTools-ChangeSorter'
+	#category : 'NewTools-ChangeSorter',
+	#package : 'NewTools-ChangeSorter'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ChangeSorterModel class >> classDescriptionsMap [
 	^ ClassDescriptionsMap
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ChangeSorterModel class >> classDescriptionsMap: anObject [
 	ClassDescriptionsMap := anObject
 ]
 
-{ #category : #defaults }
+{ #category : 'defaults' }
 ChangeSorterModel class >> defaultClassDescriptionsMap [
 	^ Dictionary new
 		at: #remove put: 'Entire class was removed.';
@@ -33,24 +34,24 @@ ChangeSorterModel class >> defaultClassDescriptionsMap [
 		yourself
 ]
 
-{ #category : #'class initialization' }
+{ #category : 'class initialization' }
 ChangeSorterModel class >> initialize [
 	self classDescriptionsMap: self defaultClassDescriptionsMap
 ]
 
-{ #category : #'change set' }
+{ #category : 'change set' }
 ChangeSorterModel >> addPreambleTo: aChangeSet [
 
 	aChangeSet assurePreambleExists
 ]
 
-{ #category : #environment }
+{ #category : 'environment' }
 ChangeSorterModel >> allChanges [
 
 	^ ChangeSet allChangeSets reverse
 ]
 
-{ #category : #method }
+{ #category : 'method' }
 ChangeSorterModel >> browseVersionsFrom: aMethod [
 	"Create and schedule a Versions Browser, showing all versions of the
 	currently selected message. Answer the browser or nil."
@@ -61,7 +62,7 @@ ChangeSorterModel >> browseVersionsFrom: aMethod [
 			Smalltalk tools versionBrowser browseVersionsForMethod: aMethod ]
 ]
 
-{ #category : #text }
+{ #category : 'text' }
 ChangeSorterModel >> buildChangeSetDescriptionFor: changeSet [
 		
 	^ changeSet
@@ -69,7 +70,7 @@ ChangeSorterModel >> buildChangeSetDescriptionFor: changeSet [
 		ifNotNil: [ changeSet preambleString ifNil: ['']]
 ]
 
-{ #category : #text }
+{ #category : 'text' }
 ChangeSorterModel >> buildClassDescriptionFor: changeSet class: class [
 	^ String streamContents: [ :stream |
 			(changeSet classChangeAt: class name)
@@ -77,7 +78,7 @@ ChangeSorterModel >> buildClassDescriptionFor: changeSet class: class [
 				separatedBy: [ stream cr ] ]
 ]
 
-{ #category : #text }
+{ #category : 'text' }
 ChangeSorterModel >> buildSelectorDescriptionFor: changeSet class: class selector: selector [
 
 	| changeType code |
@@ -96,25 +97,25 @@ ChangeSorterModel >> buildSelectorDescriptionFor: changeSet class: class selecto
 	^ code asText
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ChangeSorterModel >> classDescriptionsMap [
 
 	^ self class classDescriptionsMap
 ]
 
-{ #category : #'change set' }
+{ #category : 'change set' }
 ChangeSorterModel >> copyAllChangesFrom: source to: destination [
 
 	destination assimilateAllChangesFoundIn: source
 ]
 
-{ #category : #class }
+{ #category : 'class' }
 ChangeSorterModel >> copyClass: aClass from: source to: destination [
 
 	destination absorbClass: aClass name from: source.
 ]
 
-{ #category : #message }
+{ #category : 'message' }
 ChangeSorterModel >> copySelector: selector inClass: class from: source to: destination [
 
 	destination
@@ -123,19 +124,19 @@ ChangeSorterModel >> copySelector: selector inClass: class from: source to: dest
 		from:source
 ]
 
-{ #category : #'change set' }
+{ #category : 'change set' }
 ChangeSorterModel >> createNewSet [
 
 	^ ChangeSet newChangeSet
 ]
 
-{ #category : #'change set' }
+{ #category : 'change set' }
 ChangeSorterModel >> currentChangeSet [
 
 	^ ChangeSet current 
 ]
 
-{ #category : #class }
+{ #category : 'class' }
 ChangeSorterModel >> fileOutClass: aClass from: aChangeSet [
 	"this is a hack!! makes a new change set, called the class name, adds author initials to try to make a unique change set name, files it out and removes it. kfr 16 june 2000"
 	"Method copied from ChangeSorter"
@@ -148,13 +149,13 @@ ChangeSorterModel >> fileOutClass: aClass from: aChangeSet [
 	ChangeSet removeChangeSet: aSet.
 ]
 
-{ #category : #message }
+{ #category : 'message' }
 ChangeSorterModel >> fileOutSelector: selector from: aClass [
 	
 	aClass fileOutMethod: selector
 ]
 
-{ #category : #'change set' }
+{ #category : 'change set' }
 ChangeSorterModel >> findChangeSetIn: aCollectionOfChangeSets [
 	"Search for a changeSet by name.  Pop up a menu of all changeSets whose name contains the string entered by the user.  If only one matches, then the pop-up menu is bypassed"
 	| index pattern candidates nameList |
@@ -172,7 +173,7 @@ ChangeSorterModel >> findChangeSetIn: aCollectionOfChangeSets [
 	index = 0 ifFalse: [ ^ (candidates at: index) ].
 ]
 
-{ #category : #message }
+{ #category : 'message' }
 ChangeSorterModel >> forgetSelector: selector inClass: aClass fromChangeSet: aChangeSet [
 
 	aChangeSet
@@ -180,7 +181,7 @@ ChangeSorterModel >> forgetSelector: selector inClass: aClass fromChangeSet: aCh
 			class: aClass
 ]
 
-{ #category : #'change set' }
+{ #category : 'change set' }
 ChangeSorterModel >> removeChangeSet: aChangeSet prompting: doPrompt [
 	"Completely destroy my change set.  Check if it's OK first, and if doPrompt is true, get the user to confirm his intentions first."
 
@@ -218,13 +219,13 @@ Do you really want to go ahead with this?') ifFalse: [^ self]]].
 	ChangeSet removeChangeSet: aChangeSet.
 ]
 
-{ #category : #class }
+{ #category : 'class' }
 ChangeSorterModel >> removeClass: class from: changeSet [
 
 	changeSet removeClassChanges: class.
 ]
 
-{ #category : #'change set' }
+{ #category : 'change set' }
 ChangeSorterModel >> removePostscriptFrom: aChange [
 
 	(aChange hasPostscript and: [ aChange postscriptHasDependents ]) ifTrue:
@@ -237,7 +238,7 @@ Close that window and try again.'].
 	aChange removePostscript
 ]
 
-{ #category : #'change set' }
+{ #category : 'change set' }
 ChangeSorterModel >> rename: aChangeSet [
 	"Store a new name string into the selected ChangeSet.  reject duplicate name; allow user to back out"
 
@@ -255,7 +256,7 @@ ChangeSorterModel >> rename: aChangeSet [
 	^ aChangeSet
 ]
 
-{ #category : #text }
+{ #category : 'text' }
 ChangeSorterModel >> setContentsOfChangeSet: changeSet forClass: class andSelector: selector [
 	"return the source code that shows in the bottom pane"
 
@@ -272,14 +273,14 @@ ChangeSorterModel >> setContentsOfChangeSet: changeSet forClass: class andSelect
 			self buildSelectorDescriptionFor: changeSet class: class selector: selector ]
 ]
 
-{ #category : #'change set' }
+{ #category : 'change set' }
 ChangeSorterModel >> setCurrentChangeSet: aChangeSet [
 
 	ChangeSet newChanges: aChangeSet
 	
 ]
 
-{ #category : #'change set' }
+{ #category : 'change set' }
 ChangeSorterModel >> submerge: source into: destination [
 	"Copy the contents of the receiver to the other side, then remove the receiver -- all after checking that all is well."
 	|   message |
@@ -311,7 +312,7 @@ Do you really want to go ahead with this?') ifFalse: [^ false]].
 	^ true
 ]
 
-{ #category : #'change set' }
+{ #category : 'change set' }
 ChangeSorterModel >> subtractFrom: source to: destination [
 
 	source forgetAllChangesFoundIn: destination
diff --git a/src/NewTools-ChangeSorter/SpChangeSorterPresenter.class.st b/src/NewTools-ChangeSorter/SpChangeSorterPresenter.class.st
index b78973ea6..cd5d098e6 100644
--- a/src/NewTools-ChangeSorter/SpChangeSorterPresenter.class.st
+++ b/src/NewTools-ChangeSorter/SpChangeSorterPresenter.class.st
@@ -6,8 +6,8 @@ The DualChangeSorter tool supports manipulation of changes between containers an
 ChangeSorterPresenter new openWithSpec
 "
 Class {
-	#name : #SpChangeSorterPresenter,
-	#superclass : #StPresenter,
+	#name : 'SpChangeSorterPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'model',
 		'changesListPresenter',
@@ -15,10 +15,11 @@ Class {
 		'classesListPresenter',
 		'textPresenter'
 	],
-	#category : #'NewTools-ChangeSorter'
+	#category : 'NewTools-ChangeSorter',
+	#package : 'NewTools-ChangeSorter'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 SpChangeSorterPresenter class >> defaultLayout [
 	
 	^ SpPanedLayout newTopToBottom
@@ -34,26 +35,26 @@ SpChangeSorterPresenter class >> defaultLayout [
 		yourself
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 SpChangeSorterPresenter class >> open [
 	<script>
 	
 	self new open
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpChangeSorterPresenter class >> title [
 	^ 'Change sorter'
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpChangeSorterPresenter >> addPreamble [
 	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
 	self model addPreambleTo: self selectedChangeSet.
 	changesListPresenter selectItem: self selectedChangeSet
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpChangeSorterPresenter >> browseChangeSet [
 	"Open a message list browser on methods in the current change set"
 
@@ -67,12 +68,12 @@ SpChangeSorterPresenter >> browseChangeSet [
 		title: 'Methods in Change Set ' , self selectedChangeSet name
 ]
 
-{ #category : #'menu - message' }
+{ #category : 'menu - message' }
 SpChangeSorterPresenter >> browseImplementorsOfMessages [
 	SystemNavigation new browseAllImplementorsOf: self selectedSelector
 ]
 
-{ #category : #'menu - message' }
+{ #category : 'menu - message' }
 SpChangeSorterPresenter >> browseMethodFull [
 	"Create and schedule a full Browser and then select the current class and message."
 
@@ -80,13 +81,13 @@ SpChangeSorterPresenter >> browseMethodFull [
 		[:myClass | self application tools browser openOnClass: myClass selector: self selectedSelector ]
 ]
 
-{ #category : #'menu - message' }
+{ #category : 'menu - message' }
 SpChangeSorterPresenter >> browseSendersOfMessages [
 
 	self systemNavigation browseAllSendersOf: self selectedSelector
 ]
 
-{ #category : #'menu - message' }
+{ #category : 'menu - message' }
 SpChangeSorterPresenter >> browseVersions [
 	"Create and schedule a changelist browser on the versions of the 
 	selected message."
@@ -97,7 +98,7 @@ SpChangeSorterPresenter >> browseVersions [
 			self model browseVersionsFrom: method ]]
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 SpChangeSorterPresenter >> changeSetMenu [
 	"Set up aMenu to hold commands for the change-set-list pane.  This could be for a single or double changeSorter"
 
@@ -169,30 +170,30 @@ SpChangeSorterPresenter >> changeSetMenu [
 		yourself
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> changeSets [
 
 	^ self changesListPresenter listItems
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpChangeSorterPresenter >> changesListPresenter [
 
 	^ changesListPresenter
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> changesMenu: aBlock [
 	changesListPresenter contextMenu: aBlock
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> changesPresenterOn: aShortcut do: aBlock [
 
 	changesListPresenter bindKeyCombination: aShortcut toAction: aBlock
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 SpChangeSorterPresenter >> classMenu [
 	"Fill aMenu with items appropriate for the class list"
 
@@ -226,7 +227,7 @@ SpChangeSorterPresenter >> classMenu [
 		yourself
 ]
 
-{ #category : #shortcuts }
+{ #category : 'shortcuts' }
 SpChangeSorterPresenter >> classShortcuts: event from: aMorph [
 
 	self selectedClass ifNotNil: [ 
@@ -235,25 +236,25 @@ SpChangeSorterPresenter >> classShortcuts: event from: aMorph [
 		event keyString = '<Cmd-x>' ifTrue: [ ^ self removeClass ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpChangeSorterPresenter >> classesListPresenter [
 
 	^ classesListPresenter
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> classesMenu: aBlock [
 
 	classesListPresenter contextMenu: aBlock
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> classesOn: aShortcut do: aBlock [
 
 	classesListPresenter bindKeyCombination: aShortcut toAction: aBlock
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpChangeSorterPresenter >> connectPresenters [
 
 	self
@@ -265,7 +266,7 @@ SpChangeSorterPresenter >> connectPresenters [
 		ifNotEmpty: [ changesListPresenter selectIndex: 1 ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 SpChangeSorterPresenter >> createRingMethodForRemovedSelector: aSelector inClass: aClass [
 	"Create RingMethod from the	removealinfo"
 
@@ -276,7 +277,7 @@ SpChangeSorterPresenter >> createRingMethodForRemovedSelector: aSelector inClass
 	^ method
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 SpChangeSorterPresenter >> createRingMethodForSelector: aSelector inClass: aClass [
 	"Create RingMethod from the class compiledMethod or if it was removed from the removalinfo"
 	
@@ -284,26 +285,26 @@ SpChangeSorterPresenter >> createRingMethodForSelector: aSelector inClass: aClas
 	^ self createRingMethodForRemovedSelector: aSelector inClass: aClass.
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> currentText [
 
 	 ^ textPresenter getText
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 SpChangeSorterPresenter >> defaultTitle [
 	
 	^ 'Change Sorter'
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpChangeSorterPresenter >> editPostscript [
 
 	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
 	self selectedChangeSet editPostscript
 ]
 
-{ #category : #shortcuts }
+{ #category : 'shortcuts' }
 SpChangeSorterPresenter >> ensureKeyBindingsFor: aWidget [
 
 	super ensureKeyBindingsFor: aWidget.
@@ -314,20 +315,20 @@ SpChangeSorterPresenter >> ensureKeyBindingsFor: aWidget [
 		registerMethodShortcuts: methodsListPresenter
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpChangeSorterPresenter >> fileOut [
 
 	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
 	self selectedChangeSet fileOut
 ]
 
-{ #category : #'menu - class' }
+{ #category : 'menu - class' }
 SpChangeSorterPresenter >> fileOutClass [
 
 	self model fileOutClass: self selectedClass from: self selectedChangeSet
 ]
 
-{ #category : #'menu - message' }
+{ #category : 'menu - message' }
 SpChangeSorterPresenter >> fileOutMessage [
 	"Put a description of the selected message on a file"
 
@@ -336,7 +337,7 @@ SpChangeSorterPresenter >> fileOutMessage [
 			[ self model fileOutSelector: selector from: self selectedClass ]]
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpChangeSorterPresenter >> findChangeSet [
 
 	| set |
@@ -344,7 +345,7 @@ SpChangeSorterPresenter >> findChangeSet [
 	changesListPresenter selectItem: set
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 SpChangeSorterPresenter >> forceChangesListRefresh [
 
 	| sel |	
@@ -353,7 +354,7 @@ SpChangeSorterPresenter >> forceChangesListRefresh [
 	changesListPresenter selectItem: sel
 ]
 
-{ #category : #'menu - class' }
+{ #category : 'menu - class' }
 SpChangeSorterPresenter >> forgetClass [
 	"Remove all mention of this class from the changeSet"
 
@@ -364,7 +365,7 @@ SpChangeSorterPresenter >> forgetClass [
 
 ]
 
-{ #category : #'menu - message' }
+{ #category : 'menu - message' }
 SpChangeSorterPresenter >> forgetMessage [
 
 	self okToChange ifFalse: [^ self].
@@ -377,7 +378,7 @@ SpChangeSorterPresenter >> forgetMessage [
 		self setSelectedClassIndex: self selectedClassIndex ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpChangeSorterPresenter >> initialize [
 
 	model := ChangeSorterModel new.
@@ -389,7 +390,7 @@ SpChangeSorterPresenter >> initialize [
 	self initializeAnnouncements
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpChangeSorterPresenter >> initializeAnnouncements [
 
 	SystemAnnouncer uniqueInstance weak
@@ -399,7 +400,7 @@ SpChangeSorterPresenter >> initializeAnnouncements [
 		to: self
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpChangeSorterPresenter >> initializePresenters [
 
 	methodsListPresenter := self newList.
@@ -418,7 +419,7 @@ SpChangeSorterPresenter >> initializePresenters [
 	classesListPresenter sortingBlock: [ :a :b | a name < b name ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpChangeSorterPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter
@@ -426,7 +427,7 @@ SpChangeSorterPresenter >> initializeWindow: aWindowPresenter [
 		initialExtent: 500 @ 350
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 SpChangeSorterPresenter >> messageMenu [
 	"Build a menu with items appropriate for the message list; could be for a single or double changeSorter"
 
@@ -475,7 +476,7 @@ SpChangeSorterPresenter >> messageMenu [
 		yourself
 ]
 
-{ #category : #shortcuts }
+{ #category : 'shortcuts' }
 SpChangeSorterPresenter >> methodShortcuts: event from: aMorph [
 
 	self selectedSelector
@@ -488,31 +489,31 @@ SpChangeSorterPresenter >> methodShortcuts: event from: aMorph [
 			event keyString = '<Cmd-x>' ifTrue: [ ^ self removeMessage ]].
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpChangeSorterPresenter >> methodsListPresenter [
 
 	^ methodsListPresenter
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> methodsMenu: aBlock [
 
 	methodsListPresenter contextMenu: aBlock
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> methodsOn: aShortcut do: aBlock [
 
 	methodsListPresenter bindKeyCombination: aShortcut toAction: aBlock
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpChangeSorterPresenter >> model [
 
 	^ model
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpChangeSorterPresenter >> newSet [
 
 	| aSet |
@@ -525,7 +526,7 @@ SpChangeSorterPresenter >> newSet [
 			self updateWindowTitle ]
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpChangeSorterPresenter >> openChangeSetBrowser [
 
 	| cs |
@@ -534,7 +535,7 @@ SpChangeSorterPresenter >> openChangeSetBrowser [
 	^ self application tools messageList browseClasses: (RBBrowserEnvironment new forClasses: cs changedClasses)
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpChangeSorterPresenter >> registerChangeActions [
 
 	changesListPresenter
@@ -548,7 +549,7 @@ SpChangeSorterPresenter >> registerChangeActions [
 					classesListPresenter items: change changedClasses ] ]
 ]
 
-{ #category : #shortcuts }
+{ #category : 'shortcuts' }
 SpChangeSorterPresenter >> registerChangeSetShortcuts: aWidget [
 
 	aWidget bindKeyCombination: PharoShortcuts current browseShortcut toAction: [ self selectedChangeSet ifNotNil:[ self browseChangeSet ]].
@@ -563,7 +564,7 @@ SpChangeSorterPresenter >> registerChangeSetShortcuts: aWidget [
 		
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpChangeSorterPresenter >> registerClassActions [
 
 	classesListPresenter
@@ -578,7 +579,7 @@ SpChangeSorterPresenter >> registerClassActions [
 					methodsListPresenter items: (self selectedChangeSet selectorsInClass: class name) sort ] ]
 ]
 
-{ #category : #shortcuts }
+{ #category : 'shortcuts' }
 SpChangeSorterPresenter >> registerClassShortcuts: aWidget [
 
 	aWidget bindKeyCombination: PharoShortcuts current browseShortcut toAction: [ self selectedClass ifNotNil:[ self browseMethodFull ]].
@@ -586,7 +587,7 @@ SpChangeSorterPresenter >> registerClassShortcuts: aWidget [
 	aWidget bindKeyCombination: PharoShortcuts current removeShortcut toAction: [ self selectedClass ifNotNil:[ self removeClass ]]
 ]
 
-{ #category : #shortcuts }
+{ #category : 'shortcuts' }
 SpChangeSorterPresenter >> registerMethodShortcuts: aWidget [
 
 	aWidget bindKeyCombination: PharoShortcuts current browseShortcut toAction: [ self selectedSelector ifNotNil:[ self browseMethodFull ]].
@@ -597,13 +598,13 @@ SpChangeSorterPresenter >> registerMethodShortcuts: aWidget [
 	aWidget bindKeyCombination: PharoShortcuts current removeShortcut toAction: [ self selectedSelector ifNotNil:[ self removeMessage ]].
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpChangeSorterPresenter >> registerSelectorActions [
 
 	methodsListPresenter whenSelectionChangedDo: [ :selection | self updateTextContents ]
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpChangeSorterPresenter >> remove [
 	"Completely destroy my change set.  Check if it's OK first"
 
@@ -613,7 +614,7 @@ SpChangeSorterPresenter >> remove [
 	changesListPresenter resetSelection
 ]
 
-{ #category : #'menu - class' }
+{ #category : 'menu - class' }
 SpChangeSorterPresenter >> removeClass [
 	"Remove the selected class from the system, at interactive user request.  Make certain the user really wants to do this, since it is not reversible.  Answer true if removal actually happened."
 
@@ -621,7 +622,7 @@ SpChangeSorterPresenter >> removeClass [
 		ifTrue: [ self setSelectedChangeSet: self selectedChangeSet ]
 ]
 
-{ #category : #'menu - message' }
+{ #category : 'menu - message' }
 SpChangeSorterPresenter >> removeMessage [
 	"Remove the selected message from the system."
 	
@@ -636,7 +637,7 @@ SpChangeSorterPresenter >> removeMessage [
 					ifTrue: [ self updateMessagesList ]]
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpChangeSorterPresenter >> removePostscript [
 
 	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
@@ -644,7 +645,7 @@ SpChangeSorterPresenter >> removePostscript [
 	changesListPresenter selectItem: self selectedChangeSet
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpChangeSorterPresenter >> removePreamble [
 
 	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
@@ -653,7 +654,7 @@ SpChangeSorterPresenter >> removePreamble [
 	changesListPresenter selectItem: self selectedChangeSet
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpChangeSorterPresenter >> rename [
 	| set |
 	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
@@ -665,42 +666,42 @@ SpChangeSorterPresenter >> rename [
 	self updateWindowTitle
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> selectedChangeSet [
 
 	^ changesListPresenter selection selectedItem
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> selectedChangeSetIndex [
 
 	^ changesListPresenter selectedIndex
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> selectedClass [
 	^ classesListPresenter selection selectedItem
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> selectedClassIndex [
 
 	 ^ classesListPresenter selectedIndex
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> selectedSelector [
 
 	^ methodsListPresenter selection selectedItem
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> selectorsMenu: aBlock [
 
 	methodsListPresenter menu: aBlock
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpChangeSorterPresenter >> setCurrentChangeSet [
 
 	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
@@ -708,7 +709,7 @@ SpChangeSorterPresenter >> setCurrentChangeSet [
 	self updateWindowTitle
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpChangeSorterPresenter >> setFocus [
 
 	self focusOrder
@@ -718,42 +719,42 @@ SpChangeSorterPresenter >> setFocus [
 		add: textPresenter
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> setSelectedChangeSet: aChangeSet [
 
 	 ^ changesListPresenter selectItem: aChangeSet
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> setSelectedChangeSetIndex: anIndex [
 
 	 ^ changesListPresenter selectIndex: anIndex
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> setSelectedClass: aClass [
 
 	 ^ classesListPresenter selectItem: aClass
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> setSelectedClassIndex: anIndex [
 
 	 ^ classesListPresenter selectIndex: anIndex
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpChangeSorterPresenter >> textPresenter [
 
 	^ textPresenter
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> title [
 	^ String streamContents: [ :stream | stream << self class title << ' on: ' << self model currentChangeSet name ]
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> updateChangesList [
 
 	| sel |
@@ -762,7 +763,7 @@ SpChangeSorterPresenter >> updateChangesList [
 	changesListPresenter selectItem: sel
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> updateClassesList [
 
 	| sel |
@@ -775,7 +776,7 @@ SpChangeSorterPresenter >> updateClassesList [
 	sel ifNotNil: [ classesListPresenter selectItem: sel ]
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> updateClassesListAndMessagesList [
 
 	| sel |
@@ -785,7 +786,7 @@ SpChangeSorterPresenter >> updateClassesListAndMessagesList [
 	self updateMessagesList
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> updateMessagesList [
 
 	| sel |
@@ -798,7 +799,7 @@ SpChangeSorterPresenter >> updateMessagesList [
 	methodsListPresenter selectItem: sel
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 SpChangeSorterPresenter >> updateTextContents [
 
 	| text |
@@ -810,18 +811,18 @@ SpChangeSorterPresenter >> updateTextContents [
 	textPresenter text: text
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 SpChangeSorterPresenter >> updateTitle [
 	self withWindowDo: [ :window | window title: self title ]
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpChangeSorterPresenter >> updateWindowTitle [
 
 	self withWindowDo: [ :window | window title: self title ]
 ]
 
-{ #category : #'api - events' }
+{ #category : 'api - events' }
 SpChangeSorterPresenter >> whenChangesListChanges: aBlock [
 
 	changesListPresenter whenModelChangedDo: aBlock
diff --git a/src/NewTools-ChangeSorter/SpDualChangeSorterPresenter.class.st b/src/NewTools-ChangeSorter/SpDualChangeSorterPresenter.class.st
index 95c066546..1cde34597 100644
--- a/src/NewTools-ChangeSorter/SpDualChangeSorterPresenter.class.st
+++ b/src/NewTools-ChangeSorter/SpDualChangeSorterPresenter.class.st
@@ -5,18 +5,19 @@ A `SpDualChangeSorterPresenter is a dual change sorter. It manages two sets of c
 
 "
 Class {
-	#name : #SpDualChangeSorterPresenter,
-	#superclass : #StPresenter,
+	#name : 'SpDualChangeSorterPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'model',
 		'changeSorterLeft',
 		'changeSorterRight',
 		'isRefreshing'
 	],
-	#category : #'NewTools-ChangeSorter'
+	#category : 'NewTools-ChangeSorter',
+	#package : 'NewTools-ChangeSorter'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 SpDualChangeSorterPresenter class >> defaultLayout [
 
 	^ SpPanedLayout newLeftToRight
@@ -25,7 +26,7 @@ SpDualChangeSorterPresenter class >> defaultLayout [
 		yourself
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 SpDualChangeSorterPresenter class >> menuCommandOn: aBuilder [
 	<worldMenu>
 	
@@ -40,31 +41,31 @@ SpDualChangeSorterPresenter class >> menuCommandOn: aBuilder [
 	aBuilder withSeparatorAfter
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 SpDualChangeSorterPresenter class >> open [
 	<script>
 	
 	self new open
 ]
 
-{ #category : #'tools-registry' }
+{ #category : 'tools-registry' }
 SpDualChangeSorterPresenter class >> registerToolsOn: registry [
 	"Add ourselves to registry. See [Smalltalk tools]"
 
 	registry register: self as: #changeSorter
 ]
 
-{ #category : #icons }
+{ #category : 'icons' }
 SpDualChangeSorterPresenter class >> taskbarIconName [
 	^ #changeSorter
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpDualChangeSorterPresenter class >> title [
 	^ 'Dual Change Sorter'
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 SpDualChangeSorterPresenter >> changeSetMenuFrom: sourcePanel to: destinationPanel [
 	"Fill aMenu with items appropriate for the changes list"
 
@@ -88,19 +89,19 @@ SpDualChangeSorterPresenter >> changeSetMenuFrom: sourcePanel to: destinationPan
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpDualChangeSorterPresenter >> changeSorterLeft [
 
 	^ changeSorterLeft
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpDualChangeSorterPresenter >> changeSorterRight [
 
 	^ changeSorterRight
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpDualChangeSorterPresenter >> checkThatSidesDiffer: escapeBlock [
 	"If the change sets on both sides of the dual sorter are the same, put up an error message and escape via escapeBlock, else proceed happily"
 
@@ -115,7 +116,7 @@ be the same.'.
 	^ escapeBlock value
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 SpDualChangeSorterPresenter >> classMenuFrom: sourcePanel to: destinationPanel [
 	"Fill aMenu with items appropriate for the class list"
 
@@ -133,7 +134,7 @@ SpDualChangeSorterPresenter >> classMenuFrom: sourcePanel to: destinationPanel [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpDualChangeSorterPresenter >> connectPresenters [
 
 	changeSorterLeft 	whenChangesListChanges: [ self refeshedChangeSet: changeSorterRight ].
@@ -142,7 +143,7 @@ SpDualChangeSorterPresenter >> connectPresenters [
 
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpDualChangeSorterPresenter >> copyAllFrom: src to: dest [
 
 	self checkThatSidesDiffer: [ ^ self ].
@@ -150,7 +151,7 @@ SpDualChangeSorterPresenter >> copyAllFrom: src to: dest [
 	dest updateClassesList.
 ]
 
-{ #category : #'menu - class' }
+{ #category : 'menu - class' }
 SpDualChangeSorterPresenter >> copyClassFrom: src to: dest [
 	"Place these changes in the other changeSet also"
 
@@ -165,7 +166,7 @@ SpDualChangeSorterPresenter >> copyClassFrom: src to: dest [
 	dest setSelectedChangeSet: otherChangeSet.
 ]
 
-{ #category : #'menu - method' }
+{ #category : 'menu - method' }
 SpDualChangeSorterPresenter >> copyMethodFrom: src to: dest [
 	"Place this change in the other changeSet also"	
 	| other |
@@ -185,7 +186,7 @@ SpDualChangeSorterPresenter >> copyMethodFrom: src to: dest [
 		dest updateClassesListAndMessagesList ].
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpDualChangeSorterPresenter >> initialize [
 
 	model := ChangeSorterModel new.
@@ -197,7 +198,7 @@ SpDualChangeSorterPresenter >> initialize [
 		to: self
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpDualChangeSorterPresenter >> initializePresenters [
 
 	changeSorterLeft := self instantiate: SpChangeSorterPresenter.
@@ -208,27 +209,27 @@ SpDualChangeSorterPresenter >> initializePresenters [
 	self setFocusOrder
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpDualChangeSorterPresenter >> initializeWindow: aWindowPresenter [
 	aWindowPresenter initialExtent: 900 @ 530.
 	aWindowPresenter title: self title
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpDualChangeSorterPresenter >> menusRegistration [
 
 	self menusRegistrationFrom: changeSorterLeft to: changeSorterRight.
 	self menusRegistrationFrom: changeSorterRight to: changeSorterLeft
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 SpDualChangeSorterPresenter >> menusRegistrationFrom: src to: dest [
 	src changesMenu: (self changeSetMenuFrom: src to: dest).
 	src classesMenu: (self classMenuFrom: src to: dest).
 	src methodsMenu: (self messageMenuFrom: src to: dest)
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 SpDualChangeSorterPresenter >> messageMenuFrom: sourcePanel to: destinationPanel [
 	"Fill aMenu with items appropriate for the message list; could be for a single or double changeSorter"
 
@@ -246,13 +247,13 @@ SpDualChangeSorterPresenter >> messageMenuFrom: sourcePanel to: destinationPanel
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpDualChangeSorterPresenter >> model [
 
 	^ model
 ]
 
-{ #category : #'menu - class' }
+{ #category : 'menu - class' }
 SpDualChangeSorterPresenter >> moveClassFrom: src to: dest [
 
 	self checkThatSidesDiffer: [^ self].
@@ -262,7 +263,7 @@ SpDualChangeSorterPresenter >> moveClassFrom: src to: dest [
 	src forgetClass
 ]
 
-{ #category : #'menu - method' }
+{ #category : 'menu - method' }
 SpDualChangeSorterPresenter >> moveMethodFrom: src to: dest [
 
 	self copyMethodFrom: src to: dest.
@@ -270,7 +271,7 @@ SpDualChangeSorterPresenter >> moveMethodFrom: src to: dest [
 	src updateClassesListAndMessagesList.
 ]
 
-{ #category : #event }
+{ #category : 'event' }
 SpDualChangeSorterPresenter >> refeshedChangeSet: changeSet [
 	isRefreshing
 		ifTrue: [ ^ self ].
@@ -279,7 +280,7 @@ SpDualChangeSorterPresenter >> refeshedChangeSet: changeSet [
 	isRefreshing := false
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpDualChangeSorterPresenter >> setFocusOrder [
 
 	self focusOrder
@@ -287,21 +288,21 @@ SpDualChangeSorterPresenter >> setFocusOrder [
 		add: changeSorterRight.
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpDualChangeSorterPresenter >> shortcutsRegistration [
 
 	self shortcutsRegistrationFrom: changeSorterLeft to: changeSorterRight.
 	self shortcutsRegistrationFrom: changeSorterRight to: changeSorterLeft.
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpDualChangeSorterPresenter >> shortcutsRegistrationFrom: src to: dest [
 	
 	src changesPresenterOn: $c meta do: [ self copyAllFrom: src to: dest ].
 	src changesPresenterOn: $- meta do: [ self subtractFrom: src to: dest ]. 
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpDualChangeSorterPresenter >> submergeFrom: src into: dest [
 	"Copy the contents of the receiver to the other side, then remove the receiver -- all after checking that all is well."
 	| source destination index |
@@ -316,7 +317,7 @@ SpDualChangeSorterPresenter >> submergeFrom: src into: dest [
 	src setSelectedChangeSetIndex: index.
 ]
 
-{ #category : #'menu - change set' }
+{ #category : 'menu - change set' }
 SpDualChangeSorterPresenter >> subtractFrom: src to: dest [
 	"Subtract the changes found on the other side from the requesting side."
 	| source destination |
@@ -330,12 +331,12 @@ SpDualChangeSorterPresenter >> subtractFrom: src to: dest [
 	changeSorterRight setSelectedChangeSet: source.
 ]
 
-{ #category : #'api - window' }
+{ #category : 'api - window' }
 SpDualChangeSorterPresenter >> title [
 	^ String streamContents: [ :stream | stream << self class title << ' on: ' << self model currentChangeSet name ]
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpDualChangeSorterPresenter >> updateTitle [
 	self window title: self title
 ]
diff --git a/src/NewTools-ChangeSorter/package.st b/src/NewTools-ChangeSorter/package.st
index 782005763..7c31fe453 100644
--- a/src/NewTools-ChangeSorter/package.st
+++ b/src/NewTools-ChangeSorter/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-ChangeSorter' }
+Package { #name : 'NewTools-ChangeSorter' }
diff --git a/src/NewTools-CodeCritiques-Tests/StCritiqueBrowserPresenterTest.class.st b/src/NewTools-CodeCritiques-Tests/StCritiqueBrowserPresenterTest.class.st
index 3bf513fa3..ae883edef 100644
--- a/src/NewTools-CodeCritiques-Tests/StCritiqueBrowserPresenterTest.class.st
+++ b/src/NewTools-CodeCritiques-Tests/StCritiqueBrowserPresenterTest.class.st
@@ -2,22 +2,23 @@
 A StCritiqueBrowserTest is a test class for testing the behaivor of StCritiqueBrowserPresenter
 "
 Class {
-	#name : #StCritiqueBrowserPresenterTest,
-	#superclass : #TestCase,
+	#name : 'StCritiqueBrowserPresenterTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'critiqueBrowser',
 		'rules'
 	],
-	#category : #'NewTools-CodeCritiques-Tests'
+	#category : 'NewTools-CodeCritiques-Tests',
+	#package : 'NewTools-CodeCritiques-Tests'
 }
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCritiqueBrowserPresenterTest >> classToTest [
 
 	^ StCritiqueBrowserPresenter
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StCritiqueBrowserPresenterTest >> setUp [
 
 	super setUp.
@@ -26,7 +27,7 @@ StCritiqueBrowserPresenterTest >> setUp [
 		          aClass new ]) sorted: [ :a :b | a name < b name ].
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCritiqueBrowserPresenterTest >> testBrowseRule [
 
 	| windowBrowser singleRule |
@@ -39,7 +40,7 @@ StCritiqueBrowserPresenterTest >> testBrowseRule [
 	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCritiqueBrowserPresenterTest >> testInitializePresenters [
 
 	self
@@ -56,7 +57,7 @@ StCritiqueBrowserPresenterTest >> testInitializePresenters [
 		equals: SpListPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCritiqueBrowserPresenterTest >> testOpen [
 
 	| window |
diff --git a/src/NewTools-CodeCritiques-Tests/StCritiquePackageSelectorPresenterTest.class.st b/src/NewTools-CodeCritiques-Tests/StCritiquePackageSelectorPresenterTest.class.st
index 9a36ee624..12f04f327 100644
--- a/src/NewTools-CodeCritiques-Tests/StCritiquePackageSelectorPresenterTest.class.st
+++ b/src/NewTools-CodeCritiques-Tests/StCritiquePackageSelectorPresenterTest.class.st
@@ -2,12 +2,13 @@
 A StCritiquePackageSelectorPresenterTest is a test class for testing the behaivor of StCritiquePackageSelectorPresenter
 "
 Class {
-	#name : #StCritiquePackageSelectorPresenterTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-CodeCritiques-Tests'
+	#name : 'StCritiquePackageSelectorPresenterTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-CodeCritiques-Tests',
+	#package : 'NewTools-CodeCritiques-Tests'
 }
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCritiquePackageSelectorPresenterTest >> testInitializePresenters [
 
 	| packagesSelectorPresenter |
@@ -21,7 +22,7 @@ StCritiquePackageSelectorPresenterTest >> testInitializePresenters [
 		equals: SpButtonPresenter.
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCritiquePackageSelectorPresenterTest >> testOpen [
 
 	| window |
diff --git a/src/NewTools-CodeCritiques-Tests/StCritiqueRuleSelectorPresenterTest.class.st b/src/NewTools-CodeCritiques-Tests/StCritiqueRuleSelectorPresenterTest.class.st
index 95a680be8..7e66523bc 100644
--- a/src/NewTools-CodeCritiques-Tests/StCritiqueRuleSelectorPresenterTest.class.st
+++ b/src/NewTools-CodeCritiques-Tests/StCritiqueRuleSelectorPresenterTest.class.st
@@ -2,17 +2,18 @@
 A CStCritiqueRuleSelectorPresenterTest is a test class for testing the behaivor of StCritiqueRuleSelectorPresenter
 "
 Class {
-	#name : #StCritiqueRuleSelectorPresenterTest,
-	#superclass : #TestCase,
+	#name : 'StCritiqueRuleSelectorPresenterTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'rulesSelectorPresenter',
 		'rules',
 		'rulesByGroup'
 	],
-	#category : #'NewTools-CodeCritiques-Tests'
+	#category : 'NewTools-CodeCritiques-Tests',
+	#package : 'NewTools-CodeCritiques-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StCritiqueRuleSelectorPresenterTest >> setUp [
 
 	super setUp.
@@ -25,13 +26,13 @@ StCritiqueRuleSelectorPresenterTest >> setUp [
 			                rules: as value ]
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StCritiqueRuleSelectorPresenterTest >> tearDown [ 
 
 	super tearDown.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCritiqueRuleSelectorPresenterTest >> testAddAll [
 
 	rulesSelectorPresenter items: rulesByGroup.
@@ -39,7 +40,7 @@ StCritiqueRuleSelectorPresenterTest >> testAddAll [
 	self assert: rulesSelectorPresenter selectedRules equals: rules asSet
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCritiqueRuleSelectorPresenterTest >> testAddSelectedComposite [
 
 	| bugsGroup bugsRules |
@@ -54,7 +55,7 @@ StCritiqueRuleSelectorPresenterTest >> testAddSelectedComposite [
 		equals: bugsRules asSet
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCritiqueRuleSelectorPresenterTest >> testAddSelectedSingleRule [
 
 	| bugsGroup bugsRule |
@@ -68,7 +69,7 @@ StCritiqueRuleSelectorPresenterTest >> testAddSelectedSingleRule [
 		equals: { bugsRule } asSet
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCritiqueRuleSelectorPresenterTest >> testInitialize [
 
 	| window |
@@ -79,7 +80,7 @@ StCritiqueRuleSelectorPresenterTest >> testInitialize [
 	window close
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCritiqueRuleSelectorPresenterTest >> testOpen [
 
 	| window |
@@ -88,7 +89,7 @@ StCritiqueRuleSelectorPresenterTest >> testOpen [
 	window close
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCritiqueRuleSelectorPresenterTest >> testRemoveAll [
 
 	rulesSelectorPresenter items: rulesByGroup.
@@ -97,7 +98,7 @@ StCritiqueRuleSelectorPresenterTest >> testRemoveAll [
 	self assert: rulesSelectorPresenter selectedRules isEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCritiqueRuleSelectorPresenterTest >> testRemoveSelectedComposite [
 
 	| styleGroup styleRules |
@@ -112,7 +113,7 @@ StCritiqueRuleSelectorPresenterTest >> testRemoveSelectedComposite [
 	self assert: rulesSelectorPresenter selectedRules isEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCritiqueRuleSelectorPresenterTest >> testRemoveSelectedRule [
 
 	| apiGroup apiRule |
diff --git a/src/NewTools-CodeCritiques-Tests/StCritiqueToolbarPresenterTest.class.st b/src/NewTools-CodeCritiques-Tests/StCritiqueToolbarPresenterTest.class.st
index 901085c78..f576f6e0e 100644
--- a/src/NewTools-CodeCritiques-Tests/StCritiqueToolbarPresenterTest.class.st
+++ b/src/NewTools-CodeCritiques-Tests/StCritiqueToolbarPresenterTest.class.st
@@ -2,29 +2,30 @@
 A StCritiqueToolbarPresenterTest is a test class for testing the behaivor of StCritiqueToolbarPresenter
 "
 Class {
-	#name : #StCritiqueToolbarPresenterTest,
-	#superclass : #TestCase,
+	#name : 'StCritiqueToolbarPresenterTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'critiqueToolbar'
 	],
-	#category : #'NewTools-CodeCritiques-Tests'
+	#category : 'NewTools-CodeCritiques-Tests',
+	#package : 'NewTools-CodeCritiques-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StCritiqueToolbarPresenterTest >> setUp [
 
 	super setUp.
 	critiqueToolbar := StCritiqueToolbarPresenter new.
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCritiqueToolbarPresenterTest >> testInitialize [
 
 	self assert: critiqueToolbar critiqueHolder value isNil.
 	self assert: critiqueToolbar ruleHolder value isNil
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCritiqueToolbarPresenterTest >> testOpen [
 
 	| window |
diff --git a/src/NewTools-CodeCritiques-Tests/StResetWindowPresenterTest.class.st b/src/NewTools-CodeCritiques-Tests/StResetWindowPresenterTest.class.st
index 72d111264..4f708f4f0 100644
--- a/src/NewTools-CodeCritiques-Tests/StResetWindowPresenterTest.class.st
+++ b/src/NewTools-CodeCritiques-Tests/StResetWindowPresenterTest.class.st
@@ -2,22 +2,23 @@
 A StResetWindowPresenterTest is a test class for testing the behaivor of StResetWindowPresenter
 "
 Class {
-	#name : #StResetWindowPresenterTest,
-	#superclass : #TestCase,
+	#name : 'StResetWindowPresenterTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'resetWindow'
 	],
-	#category : #'NewTools-CodeCritiques-Tests'
+	#category : 'NewTools-CodeCritiques-Tests',
+	#package : 'NewTools-CodeCritiques-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StResetWindowPresenterTest >> setUp [
 
 	super setUp.
 	resetWindow := StResetWindowPresenter new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StResetWindowPresenterTest >> testInitializePresenters [
 self
 		assert: resetWindow resetModel class
@@ -28,7 +29,7 @@ self
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StResetWindowPresenterTest >> testOpen [
 
 	| resetPresenter |
@@ -37,7 +38,7 @@ StResetWindowPresenterTest >> testOpen [
  	resetPresenter close
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StResetWindowPresenterTest >> testOpenPackagesChooser [
 
 	| applier |
diff --git a/src/NewTools-CodeCritiques-Tests/package.st b/src/NewTools-CodeCritiques-Tests/package.st
index 3010eddbb..38a2c08d8 100644
--- a/src/NewTools-CodeCritiques-Tests/package.st
+++ b/src/NewTools-CodeCritiques-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-CodeCritiques-Tests' }
+Package { #name : 'NewTools-CodeCritiques-Tests' }
diff --git a/src/NewTools-CriticsBrowser/StCriticPackageChooserPresenter.class.st b/src/NewTools-CriticsBrowser/StCriticPackageChooserPresenter.class.st
index bd6673bad..c5441cf38 100644
--- a/src/NewTools-CriticsBrowser/StCriticPackageChooserPresenter.class.st
+++ b/src/NewTools-CriticsBrowser/StCriticPackageChooserPresenter.class.st
@@ -1,21 +1,22 @@
 Class {
-	#name : #StCriticPackageChooserPresenter,
-	#superclass : #StPackageChooserPresenter,
+	#name : 'StCriticPackageChooserPresenter',
+	#superclass : 'StPackageChooserPresenter',
 	#instVars : [
 		'packageActionBar',
 		'testPackages'
 	],
-	#category : #'NewTools-CriticsBrowser'
+	#category : 'NewTools-CriticsBrowser',
+	#package : 'NewTools-CriticsBrowser'
 }
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCriticPackageChooserPresenter >> initialize [
 
 	testPackages := false.
 	super initialize
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCriticPackageChooserPresenter >> initializeLayout [
 	
 	self layout: (SpBoxLayout newTopToBottom
@@ -34,7 +35,7 @@ StCriticPackageChooserPresenter >> initializeLayout [
 		yourself)
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCriticPackageChooserPresenter >> initializePackageList [
 
 	super initializePackageList.
@@ -46,7 +47,7 @@ StCriticPackageChooserPresenter >> initializePackageList [
 		yourself)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StCriticPackageChooserPresenter >> packages [
 	| packages |
 
@@ -56,7 +57,7 @@ StCriticPackageChooserPresenter >> packages [
 			ifFalse: [ self removeTestPackagesFrom: packages ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StCriticPackageChooserPresenter >> removeTestPackagesFrom: aCollectionOfPackages [
 	| regex |
 
@@ -66,7 +67,7 @@ StCriticPackageChooserPresenter >> removeTestPackagesFrom: aCollectionOfPackages
 	
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StCriticPackageChooserPresenter >> testPackages: aBoolean [ 
 
 	testPackages := aBoolean.
@@ -75,7 +76,7 @@ StCriticPackageChooserPresenter >> testPackages: aBoolean [
 	self updatePresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCriticPackageChooserPresenter >> withTestPackages [
 
 	^ testPackages
diff --git a/src/NewTools-CriticsBrowser/StCriticRuleChooserPresenter.class.st b/src/NewTools-CriticsBrowser/StCriticRuleChooserPresenter.class.st
index 0a28e7388..a26fb5d79 100644
--- a/src/NewTools-CriticsBrowser/StCriticRuleChooserPresenter.class.st
+++ b/src/NewTools-CriticsBrowser/StCriticRuleChooserPresenter.class.st
@@ -1,21 +1,22 @@
 Class {
-	#name : #StCriticRuleChooserPresenter,
-	#superclass : #StPackageChooserPresenter,
+	#name : 'StCriticRuleChooserPresenter',
+	#superclass : 'StPackageChooserPresenter',
 	#instVars : [
 		'packageActionBar',
 		'testPackages'
 	],
-	#category : #'NewTools-CriticsBrowser'
+	#category : 'NewTools-CriticsBrowser',
+	#package : 'NewTools-CriticsBrowser'
 }
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCriticRuleChooserPresenter >> initialize [
 
 	testPackages := false.
 	super initialize
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCriticRuleChooserPresenter >> initializeLayout [
 	
 	self layout: (SpBoxLayout newTopToBottom
@@ -34,14 +35,14 @@ StCriticRuleChooserPresenter >> initializeLayout [
 		yourself)
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCriticRuleChooserPresenter >> initializePackageList [
 	
 	super initializePackageList.
 	packageList display: [ :each | each name ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StCriticRuleChooserPresenter >> packages [
 	| rules rulesByGroup |
 	
diff --git a/src/NewTools-CriticsBrowser/StCriticWizardPresenter.class.st b/src/NewTools-CriticsBrowser/StCriticWizardPresenter.class.st
index 9e2a419e0..2054ffdb9 100644
--- a/src/NewTools-CriticsBrowser/StCriticWizardPresenter.class.st
+++ b/src/NewTools-CriticsBrowser/StCriticWizardPresenter.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #StCriticWizardPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StCriticWizardPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'contentPresenter',
 		'nextButtonPresenter',
@@ -8,34 +8,35 @@ Class {
 		'wizardPresenters',
 		'finishButtonPresenter'
 	],
-	#category : #'NewTools-CriticsBrowser'
+	#category : 'NewTools-CriticsBrowser',
+	#package : 'NewTools-CriticsBrowser'
 }
 
-{ #category : #actions }
+{ #category : 'actions' }
 StCriticWizardPresenter >> doBack [
 
 	self replaceContentWith: (self wizardPresenters before: contentPresenter)
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StCriticWizardPresenter >> doFinish [
 
 	
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StCriticWizardPresenter >> doNext [
 
 	self replaceContentWith: (self wizardPresenters after: contentPresenter)
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StCriticWizardPresenter >> firstPresenter [
 	
 	^ self wizardPresenters first
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCriticWizardPresenter >> initializePresenters [
 	<script: 'self new openWithSpec'>
 
@@ -60,13 +61,13 @@ StCriticWizardPresenter >> initializePresenters [
 			action: [ self doFinish ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StCriticWizardPresenter >> lastPresenter [
 	
 	^ self wizardPresenters last
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StCriticWizardPresenter >> newWizardPresenters [
 
 	^ {  
@@ -75,7 +76,7 @@ StCriticWizardPresenter >> newWizardPresenters [
 	}
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StCriticWizardPresenter >> replaceContentWith: aPresenter [
 
 	self layout 
@@ -85,7 +86,7 @@ StCriticWizardPresenter >> replaceContentWith: aPresenter [
 	self updatePresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StCriticWizardPresenter >> updatePresenter [
 
 	contentPresenter = self firstPresenter 
@@ -100,7 +101,7 @@ StCriticWizardPresenter >> updatePresenter [
 			finishButtonPresenter hide ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StCriticWizardPresenter >> wizardPresenters [
 
 	^ wizardPresenters ifNil: [
diff --git a/src/NewTools-CriticsBrowser/StPackageChooserPresenter.class.st b/src/NewTools-CriticsBrowser/StPackageChooserPresenter.class.st
index 555aae07a..91393b7f2 100644
--- a/src/NewTools-CriticsBrowser/StPackageChooserPresenter.class.st
+++ b/src/NewTools-CriticsBrowser/StPackageChooserPresenter.class.st
@@ -1,21 +1,22 @@
 Class {
-	#name : #StPackageChooserPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StPackageChooserPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'packageList',
 		'selectedPackagesList',
 		'buttonBar'
 	],
-	#category : #'NewTools-CriticsBrowser'
+	#category : 'NewTools-CriticsBrowser',
+	#package : 'NewTools-CriticsBrowser'
 }
 
-{ #category : #example }
+{ #category : 'example' }
 StPackageChooserPresenter class >> example [
 
 	self new openWithSpec
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPackageChooserPresenter >> addAll [
 
 	selectedPackagesList items: 
@@ -26,7 +27,7 @@ StPackageChooserPresenter >> addAll [
 	
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPackageChooserPresenter >> addSelected [
 
 	selectedPackagesList items: 
@@ -36,13 +37,13 @@ StPackageChooserPresenter >> addSelected [
 	packageList selectItems: #()
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPackageChooserPresenter >> doAccept [
 
 	self window close
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPackageChooserPresenter >> initalizeSelectedPackageList [
 	
 	selectedPackagesList 
@@ -50,7 +51,7 @@ StPackageChooserPresenter >> initalizeSelectedPackageList [
 		display: [ :each | each packageName ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPackageChooserPresenter >> initializeButtonBar [
 			
 	buttonBar 
@@ -85,14 +86,14 @@ StPackageChooserPresenter >> initializeButtonBar [
 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPackageChooserPresenter >> initializeDialogWindow: aDialogWindowPresenter [
 
 	aDialogWindowPresenter
 		addButton: 'Accept' do: [ self doAccept ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPackageChooserPresenter >> initializeLayout [
 	
 	self layout: (SpBoxLayout newTopToBottom
@@ -108,7 +109,7 @@ StPackageChooserPresenter >> initializeLayout [
 		yourself)
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPackageChooserPresenter >> initializePackageList [
 	
 	packageList 
@@ -116,7 +117,7 @@ StPackageChooserPresenter >> initializePackageList [
 		display: [ :each | each packageName ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPackageChooserPresenter >> initializePresenters [
 	<script: 'self new openWithSpec'>
 
@@ -126,7 +127,7 @@ StPackageChooserPresenter >> initializePresenters [
 	self initializeButtonBar
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPackageChooserPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter 
@@ -135,7 +136,7 @@ StPackageChooserPresenter >> initializeWindow: aWindowPresenter [
 
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPackageChooserPresenter >> packageListMenu [
 		
 	^ self newMenu
@@ -144,20 +145,20 @@ StPackageChooserPresenter >> packageListMenu [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPackageChooserPresenter >> packages [
 
 	^ RPackageOrganizer default packages sorted: #packageName ascending
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPackageChooserPresenter >> removeAll [
 
 	selectedPackagesList items: #().
 	packageList items: self packages
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPackageChooserPresenter >> removeSelected [
 
 	packageList items: ((packageList items, selectedPackagesList selectedItems) sorted: #packageName ascending).
@@ -165,7 +166,7 @@ StPackageChooserPresenter >> removeSelected [
 	selectedPackagesList selectItems: #()
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPackageChooserPresenter >> selectedPackageListMenu [
 		
 	^ self newMenu
@@ -174,7 +175,7 @@ StPackageChooserPresenter >> selectedPackageListMenu [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPackageChooserPresenter >> updatePresenter [
 
 	packageList items: self packages
diff --git a/src/NewTools-CriticsBrowser/package.st b/src/NewTools-CriticsBrowser/package.st
index 3a67f1bb2..94af46d7f 100644
--- a/src/NewTools-CriticsBrowser/package.st
+++ b/src/NewTools-CriticsBrowser/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-CriticsBrowser' }
+Package { #name : 'NewTools-CriticsBrowser' }
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/Breakpoint.extension.st b/src/NewTools-Debugger-Breakpoints-Tools/Breakpoint.extension.st
index 132e9d162..18c33319a 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/Breakpoint.extension.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/Breakpoint.extension.st
@@ -1,22 +1,22 @@
-Extension { #name : #Breakpoint }
+Extension { #name : 'Breakpoint' }
 
-{ #category : #'*NewTools-Debugger-Breakpoints-Tools' }
+{ #category : '*NewTools-Debugger-Breakpoints-Tools' }
 Breakpoint >> asBreakpointInspectionItemIn: aStBreakpointInspectionItem [ 
 	^aStBreakpointInspectionItem buildBreakpointItemFor: self
 ]
 
-{ #category : #'*NewTools-Debugger-Breakpoints-Tools' }
+{ #category : '*NewTools-Debugger-Breakpoints-Tools' }
 Breakpoint >> printContentsForBreakpointInspection [
 	^node methodNode sourceCode
 ]
 
-{ #category : #'*NewTools-Debugger-Breakpoints-Tools' }
+{ #category : '*NewTools-Debugger-Breakpoints-Tools' }
 Breakpoint >> printTargetForBreakpointInspection [
 
 	^ node methodNode compiledMethod printString
 ]
 
-{ #category : #'*NewTools-Debugger-Breakpoints-Tools' }
+{ #category : '*NewTools-Debugger-Breakpoints-Tools' }
 Breakpoint >> scopeIncludes: anObject [
 
 	self isObjectCentric ifTrue: [ ^ targetInstance == anObject ].
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/Object.extension.st b/src/NewTools-Debugger-Breakpoints-Tools/Object.extension.st
index 866f46afd..35b9a6809 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/Object.extension.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/Object.extension.st
@@ -1,13 +1,13 @@
-Extension { #name : #Object }
+Extension { #name : 'Object' }
 
-{ #category : #'*NewTools-Debugger-Breakpoints-Tools' }
+{ #category : '*NewTools-Debugger-Breakpoints-Tools' }
 Object >> inspectionBreakpoints [
 	<inspectorPresentationOrder: 998 title: 'Breakpoints'>
 
 	^ StObjectBreakpointInspection on: self
 ]
 
-{ #category : #'*NewTools-Debugger-Breakpoints-Tools' }
+{ #category : '*NewTools-Debugger-Breakpoints-Tools' }
 Object >> inspectionBreakpointsContext: aContext [
 
 	aContext withoutEvaluator
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StBreakpointInspectionItem.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StBreakpointInspectionItem.class.st
index 713c51e0a..a6d1f9e84 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StBreakpointInspectionItem.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StBreakpointInspectionItem.class.st
@@ -2,20 +2,22 @@
 I am a data holder for breakpoints to be displayed in StObjectBreakpointInspection tables.
 "
 Class {
-	#name : #StBreakpointInspectionItem,
-	#superclass : #StHaltInspectionItem,
+	#name : 'StBreakpointInspectionItem',
+	#superclass : 'StHaltInspectionItem',
 	#instVars : [
 		'breakpoint'
 	],
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Presenters'
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Presenters',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Presenters'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StBreakpointInspectionItem >> breakpoint [
 	^ breakpoint
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StBreakpointInspectionItem >> buildBreakpointItemFor: aBreakpoint [
 
 	node := aBreakpoint node.
@@ -27,7 +29,7 @@ StBreakpointInspectionItem >> buildBreakpointItemFor: aBreakpoint [
 	displayEntity := aBreakpoint
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StBreakpointInspectionItem >> buildVariableBreakpointItemFor: aVariableBreakpoint [
 
 	type := Break name asString.
@@ -37,17 +39,17 @@ StBreakpointInspectionItem >> buildVariableBreakpointItemFor: aVariableBreakpoin
 	displayEntity := aVariableBreakpoint
 ]
 
-{ #category : #control }
+{ #category : 'control' }
 StBreakpointInspectionItem >> disableInContext: aStHaltAndBreakpointController [ 
 	aStHaltAndBreakpointController disableBreakpoint: breakpoint
 ]
 
-{ #category : #control }
+{ #category : 'control' }
 StBreakpointInspectionItem >> enableInContext: aStHaltAndBreakpointController [ 
 	aStHaltAndBreakpointController enableBreakpoint: breakpoint
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StBreakpointInspectionItem >> entityToBrowse [
 
 	breakpoint isVariableBreakpoint ifTrue: [ 
@@ -55,40 +57,40 @@ StBreakpointInspectionItem >> entityToBrowse [
 	^ breakpoint node methodNode method
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StBreakpointInspectionItem >> forBreakpoint: aBreakpoint [ 
 	breakpoint := aBreakpoint.
 	^aBreakpoint asBreakpointInspectionItemIn: self
 ]
 
-{ #category : #control }
+{ #category : 'control' }
 StBreakpointInspectionItem >> isEnabledInContext: aStHaltAndBreakpointController [ 
 	^aStHaltAndBreakpointController isBreakpointEnabled: breakpoint
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StBreakpointInspectionItem >> printContents [
 	^displayEntity printContentsForBreakpointInspection
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StBreakpointInspectionItem >> printEntity [
 	^displayEntity printTargetForBreakpointInspection
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StBreakpointInspectionItem >> printScope [
 	breakpoint isObjectCentric ifTrue:[^'self'].
 	^ scope printString
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StBreakpointInspectionItem >> removeInPresenterContext: aStObjectBreakpointInspection [ 
 	breakpoint remove.
 	aStObjectBreakpointInspection update
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StBreakpointInspectionItem >> updateSourceCodePaneFor: aStObjectBreakpointInspection [
 
 	breakpoint isVariableBreakpoint ifTrue: [ 
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StDebuggerBreakpointInspection.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StDebuggerBreakpointInspection.class.st
index fb43dd8aa..943178b06 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StDebuggerBreakpointInspection.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StDebuggerBreakpointInspection.class.st
@@ -4,38 +4,40 @@ Instead of showing breakpoints and halts in the inspected object, shows them for
 Data is taken from system's and tools' caches.
 "
 Class {
-	#name : #StDebuggerBreakpointInspection,
-	#superclass : #StObjectBreakpointInspection,
+	#name : 'StDebuggerBreakpointInspection',
+	#superclass : 'StObjectBreakpointInspection',
 	#traits : 'TStDebuggerExtension',
 	#classTraits : 'TStDebuggerExtension classTrait',
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Presenters'
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Presenters',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Presenters'
 }
 
-{ #category : #'debugger extension' }
+{ #category : 'debugger extension' }
 StDebuggerBreakpointInspection class >> defaultDisplayOrder [
 
 	^ 3
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 StDebuggerBreakpointInspection >> accept: aVisitor [
 
 	^ aVisitor visitBreakpoints: self
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StDebuggerBreakpointInspection >> breakPointsForModel [
 	^ Breakpoint all
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StDebuggerBreakpointInspection >> buildHaltData [
 
 	^ StHaltCache defaultCache methodsWithHalts values flattened 
 		  collect: [ :node | StHaltInspectionItem forHalt: node ]
 ]
 
-{ #category : #'debugger extension' }
+{ #category : 'debugger extension' }
 StDebuggerBreakpointInspection >> debuggerExtensionToolName [
 
 	^ 'Breakpoints'
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StDummyTestClassWithHalts.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StDummyTestClassWithHalts.class.st
index abf9883ab..44ecc1b42 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StDummyTestClassWithHalts.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StDummyTestClassWithHalts.class.st
@@ -3,15 +3,17 @@ I am only there to be used by the StBreakpointCacheTest class.
 Compile method with and without breakpoints, but remove them after the tests.
 "
 Class {
-	#name : #StDummyTestClassWithHalts,
-	#superclass : #Object,
+	#name : 'StDummyTestClassWithHalts',
+	#superclass : 'Object',
 	#instVars : [
 		'var'
 	],
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Tests'
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Tests',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Tests'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDummyTestClassWithHalts >> var [
 	"the var is used for testing, this accessor us just here so that it has one user"
 	^var
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointControlTest.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointControlTest.class.st
index a44c285d2..a066a8bdb 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointControlTest.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointControlTest.class.st
@@ -1,19 +1,21 @@
 Class {
-	#name : #StHaltAndBreakpointControlTest,
-	#superclass : #TestCase,
+	#name : 'StHaltAndBreakpointControlTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'cache'
 	],
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Tests'
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Tests',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Tests'
 }
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 StHaltAndBreakpointControlTest >> compileMethodsWithHalts [
 	self methodWithHaltSources
 		do: [ :source | self testClass compile: source ]
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 StHaltAndBreakpointControlTest >> methodWithHaltSources [
 	| sources |
 	sources := OrderedCollection new.
@@ -28,13 +30,13 @@ StHaltAndBreakpointControlTest >> methodWithHaltSources [
 	^sources
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 StHaltAndBreakpointControlTest >> removeMethodsWithHalts [
 
 	(self testClass methods select: [ :m | m selector includesSubstring: 'Halt' ]) do: [ :method | self testClass removeSelector: method selector ]
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StHaltAndBreakpointControlTest >> setUp [
 	super setUp.
 	StHaltCache defaultCache removeSubscriptions.	
@@ -43,7 +45,7 @@ StHaltAndBreakpointControlTest >> setUp [
 	self compileMethodsWithHalts.
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StHaltAndBreakpointControlTest >> tearDown [
 	StHaltCache defaultCache updateSubscriptions.
 	cache removeSubscriptions.
@@ -52,7 +54,7 @@ StHaltAndBreakpointControlTest >> tearDown [
 	super tearDown
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltAndBreakpointControlTest >> testClass [
 	^ StDummyTestClassWithHalts
 ]
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointController.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointController.class.st
index 8c090d5a4..67a39631b 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointController.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointController.class.st
@@ -3,48 +3,50 @@ I provide control over halts messages and breakpoints for activating and deactiv
 I also tell if a program node has active breakpoints or halts on it.
 "
 Class {
-	#name : #StHaltAndBreakpointController,
-	#superclass : #Object,
+	#name : 'StHaltAndBreakpointController',
+	#superclass : 'Object',
 	#classInstVars : [
 		'tracer'
 	],
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Model'
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Model',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Model'
 }
 
-{ #category : #Helpers }
+{ #category : 'Helpers' }
 StHaltAndBreakpointController class >> printSkipTextFor: aProgramNode [
 	^ aProgramNode methodNode source asText
 		makeBoldFrom: aProgramNode start to: aProgramNode stop;
 		yourself
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 StHaltAndBreakpointController class >> skipHaltNode: aProgramNode [
 	self trace: (self printSkipTextFor: aProgramNode)
 ]
 
-{ #category : #Helpers }
+{ #category : 'Helpers' }
 StHaltAndBreakpointController class >> trace: aTextOrString [
 	self tracer crTrace: aTextOrString
 ]
 
-{ #category : #Helpers }
+{ #category : 'Helpers' }
 StHaltAndBreakpointController class >> tracer [
 	^ tracer ifNil: [ tracer := Transcript ]
 ]
 
-{ #category : #Helpers }
+{ #category : 'Helpers' }
 StHaltAndBreakpointController class >> tracer: aTracer [
 	tracer := aTracer
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 StHaltAndBreakpointController >> disableBreakpoint: aBreakpoint [
 
 	aBreakpoint disable
 ]
 
-{ #category : #links }
+{ #category : 'links' }
 StHaltAndBreakpointController >> disableHaltLink: control [
 	^ MetaLink new
 		metaObject: self class;
@@ -54,37 +56,37 @@ StHaltAndBreakpointController >> disableHaltLink: control [
 		yourself
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 StHaltAndBreakpointController >> disableHaltNode: aMessageNode [
 	self skipNode: aMessageNode.
 	aMessageNode enableHalts: false
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 StHaltAndBreakpointController >> disableHaltOrBreakpointFor: haltOrBreakpointItem [
 
 	haltOrBreakpointItem disableInContext: self
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 StHaltAndBreakpointController >> enableBreakpoint: aBreakpoint [
 
 	aBreakpoint enable
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 StHaltAndBreakpointController >> enableHaltNode: aMessageNode [
 	self removeSkipLinksFor: aMessageNode.
 	aMessageNode enableHalts: true
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 StHaltAndBreakpointController >> enableHaltOrBreakpointFor: haltOrBreakpointItem [
 
 	haltOrBreakpointItem enableInContext: self
 ]
 
-{ #category : #links }
+{ #category : 'links' }
 StHaltAndBreakpointController >> installSkipLinkOn: aMessageNode [
 	| control |
 	control := aMessageNode isReturn
@@ -93,27 +95,27 @@ StHaltAndBreakpointController >> installSkipLinkOn: aMessageNode [
 	aMessageNode link: (self disableHaltLink: control)
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 StHaltAndBreakpointController >> isBreakpointEnabled: aBreakpoint [ 
 	^aBreakpoint isEnabled
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 StHaltAndBreakpointController >> isHaltEnabledFor: aProgramNode [
 	^ aProgramNode enabledForHaltOrBreakpoint
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 StHaltAndBreakpointController >> isHaltNodeEnabled: aRBMessageNode [ 
 	^aRBMessageNode enabledForHaltOrBreakpoint
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 StHaltAndBreakpointController >> isHaltOrBreakpointEnabled: aStBreakpointInspectionItem [ 
 	^aStBreakpointInspectionItem isEnabledInContext: self
 ]
 
-{ #category : #links }
+{ #category : 'links' }
 StHaltAndBreakpointController >> removeSkipLinksFor: aNode [
 	(aNode links
 		select:
@@ -121,7 +123,7 @@ StHaltAndBreakpointController >> removeSkipLinksFor: aNode [
 		do: [ :link | link uninstall ]
 ]
 
-{ #category : #control }
+{ #category : 'control' }
 StHaltAndBreakpointController >> skipNode: aNode [
 	(self isHaltEnabledFor: aNode)
 		ifFalse: [ ^ self ].
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointControllerTest.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointControllerTest.class.st
index 04b96a259..f29df87c9 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointControllerTest.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StHaltAndBreakpointControllerTest.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #StHaltAndBreakpointControllerTest,
-	#superclass : #StHaltAndBreakpointControlTest,
+	#name : 'StHaltAndBreakpointControllerTest',
+	#superclass : 'StHaltAndBreakpointControlTest',
 	#instVars : [
 		'haltController',
 		'testObject',
@@ -8,15 +8,17 @@ Class {
 		'oldTracer',
 		'breakpoint'
 	],
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Tests'
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Tests',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Tests'
 }
 
-{ #category : #helper }
+{ #category : 'helper' }
 StHaltAndBreakpointControllerTest >> crTrace: aTextOrString [
 	trace := aTextOrString 
 ]
 
-{ #category : #helper }
+{ #category : 'helper' }
 StHaltAndBreakpointControllerTest >> installBreakpointOn: aNode [
 	^ Breakpoint new
 		node: aNode;
@@ -24,17 +26,17 @@ StHaltAndBreakpointControllerTest >> installBreakpointOn: aNode [
 		yourself
 ]
 
-{ #category : #helper }
+{ #category : 'helper' }
 StHaltAndBreakpointControllerTest >> node [
 	^ (cache nodeCacheForSelector: 'StDummyTestClassWithHalts>>#mHalt') first 
 ]
 
-{ #category : #helper }
+{ #category : 'helper' }
 StHaltAndBreakpointControllerTest >> nodeForBreakpoint [
 	^ (StDummyTestClassWithHalts >> #mNoHalt) ast statements first
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StHaltAndBreakpointControllerTest >> setUp [
 	super setUp.
 	testObject := StDummyTestClassWithHalts new.
@@ -44,7 +46,7 @@ StHaltAndBreakpointControllerTest >> setUp [
 	breakpoint := self installBreakpointOn: self nodeForBreakpoint
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StHaltAndBreakpointControllerTest >> tearDown [
 	trace := nil.
 	StHaltAndBreakpointController tracer: oldTracer.
@@ -52,7 +54,7 @@ StHaltAndBreakpointControllerTest >> tearDown [
 	super tearDown
 ]
 
-{ #category : #'tests - breakpoints' }
+{ #category : 'tests - breakpoints' }
 StHaltAndBreakpointControllerTest >> testDisableBreakpoint [
 	<ignoreNotImplementedSelectors: #(mNoHalt)>
 	self should: [ testObject mNoHalt ] raise: Break.
@@ -61,7 +63,7 @@ StHaltAndBreakpointControllerTest >> testDisableBreakpoint [
 	
 ]
 
-{ #category : #'tests - halts' }
+{ #category : 'tests - halts' }
 StHaltAndBreakpointControllerTest >> testDisableHalt [
 	<ignoreNotImplementedSelectors: #(mHalt)>
 	self should: [ testObject mHalt ] raise: Halt.	
@@ -69,7 +71,7 @@ StHaltAndBreakpointControllerTest >> testDisableHalt [
 	self shouldnt: [ testObject mHalt ] raise: Halt
 ]
 
-{ #category : #'tests - breakpoints' }
+{ #category : 'tests - breakpoints' }
 StHaltAndBreakpointControllerTest >> testDisabledBreakpointisDisabled [
 
 	haltController disableBreakpoint: breakpoint.
@@ -78,7 +80,7 @@ StHaltAndBreakpointControllerTest >> testDisabledBreakpointisDisabled [
 			 (StBreakpointInspectionItem forBreakpoint: breakpoint))
 ]
 
-{ #category : #'tests - halts' }
+{ #category : 'tests - halts' }
 StHaltAndBreakpointControllerTest >> testDisabledHaltIsDisabled [
 
 	haltController disableHaltNode: self node.
@@ -87,7 +89,7 @@ StHaltAndBreakpointControllerTest >> testDisabledHaltIsDisabled [
 			 (StHaltInspectionItem forHalt: self node))
 ]
 
-{ #category : #'tests - breakpoints' }
+{ #category : 'tests - breakpoints' }
 StHaltAndBreakpointControllerTest >> testEnableDisabledBreakpoint [
 	<ignoreNotImplementedSelectors: #(mNoHalt)>
 	haltController disableBreakpoint: breakpoint.
@@ -96,7 +98,7 @@ StHaltAndBreakpointControllerTest >> testEnableDisabledBreakpoint [
 	self should: [ testObject mNoHalt ] raise: Break
 ]
 
-{ #category : #'tests - halts' }
+{ #category : 'tests - halts' }
 StHaltAndBreakpointControllerTest >> testEnableDisabledHalt [
 	<ignoreNotImplementedSelectors: #(mHalt)>	
 	haltController disableHaltNode: self node.
@@ -105,7 +107,7 @@ StHaltAndBreakpointControllerTest >> testEnableDisabledHalt [
 	self should: [ testObject mHalt ] raise: Halt
 ]
 
-{ #category : #'tests - breakpoints' }
+{ #category : 'tests - breakpoints' }
 StHaltAndBreakpointControllerTest >> testEnabledBreakpointIsEnabled [
 
 	self assert: (haltController isBreakpointEnabled: breakpoint).
@@ -113,12 +115,12 @@ StHaltAndBreakpointControllerTest >> testEnabledBreakpointIsEnabled [
 			 (StBreakpointInspectionItem forBreakpoint: breakpoint))
 ]
 
-{ #category : #'tests - halts' }
+{ #category : 'tests - halts' }
 StHaltAndBreakpointControllerTest >> testEnabledHaltIsEnabled [
 	self assert: (haltController isHaltEnabledFor: self node)
 ]
 
-{ #category : #'tests - breakpoints' }
+{ #category : 'tests - breakpoints' }
 StHaltAndBreakpointControllerTest >> testNoTraceForEnabledBreakpoint [
 	<ignoreNotImplementedSelectors: #(mNoHalt)>
 	[ testObject mNoHalt ]
@@ -127,7 +129,7 @@ StHaltAndBreakpointControllerTest >> testNoTraceForEnabledBreakpoint [
 	self assert: trace isNil
 ]
 
-{ #category : #'tests - halts' }
+{ #category : 'tests - halts' }
 StHaltAndBreakpointControllerTest >> testNoTraceForEnabledHalt [
 	<ignoreNotImplementedSelectors: #(mHalt)>
 	[ testObject mHalt ]
@@ -136,7 +138,7 @@ StHaltAndBreakpointControllerTest >> testNoTraceForEnabledHalt [
 	self assert: trace isNil
 ]
 
-{ #category : #'tests - halts' }
+{ #category : 'tests - halts' }
 StHaltAndBreakpointControllerTest >> testTraceForDisabledHalt [
 	<ignoreNotImplementedSelectors: #(mHalt)>
 	haltController disableHaltNode: self node.
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StHaltBreakpointInspectionItemTest.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StHaltBreakpointInspectionItemTest.class.st
index 91de98525..91534e0aa 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StHaltBreakpointInspectionItemTest.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StHaltBreakpointInspectionItemTest.class.st
@@ -1,42 +1,44 @@
 Class {
-	#name : #StHaltBreakpointInspectionItemTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Tests'
+	#name : 'StHaltBreakpointInspectionItemTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Tests',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Tests'
 }
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 StHaltBreakpointInspectionItemTest >> breakpoint [
 
 	^ Breakpoint new node:
 		  (StDummyTestClassWithHalts >> #mHalt) ast statements first
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 StHaltBreakpointInspectionItemTest >> compileHaltNode [
 
 	StDummyTestClassWithHalts compile: 'mHalt self halt'.
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 StHaltBreakpointInspectionItemTest >> haltNode [
 
 	^ (StDummyTestClassWithHalts >> #mHalt) ast statements first
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 StHaltBreakpointInspectionItemTest >> removeHaltNode [
 
 	StDummyTestClassWithHalts removeSelector: #mHalt
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StHaltBreakpointInspectionItemTest >> setUp [
 	super setUp.
 	StHaltCache defaultCache removeSubscriptions.	
 	self compileHaltNode.
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StHaltBreakpointInspectionItemTest >> tearDown [
 
 	self removeHaltNode.
@@ -44,7 +46,7 @@ StHaltBreakpointInspectionItemTest >> tearDown [
 	super tearDown
 ]
 
-{ #category : #'tests - initialization' }
+{ #category : 'tests - initialization' }
 StHaltBreakpointInspectionItemTest >> testNewBreakpointItem [
 
 	| bp item |
@@ -60,7 +62,7 @@ StHaltBreakpointInspectionItemTest >> testNewBreakpointItem [
 	self assert: item type equals: Break printString
 ]
 
-{ #category : #'tests - initialization' }
+{ #category : 'tests - initialization' }
 StHaltBreakpointInspectionItemTest >> testNewHaltItem [
 
 	| item |
@@ -76,7 +78,7 @@ StHaltBreakpointInspectionItemTest >> testNewHaltItem [
 	self assert: item type equals: Halt name asString
 ]
 
-{ #category : #'tests - initialization' }
+{ #category : 'tests - initialization' }
 StHaltBreakpointInspectionItemTest >> testNewObjectCentricBreakpointItem [
 	|bp item|
 	bp := self breakpoint.
@@ -85,7 +87,7 @@ StHaltBreakpointInspectionItemTest >> testNewObjectCentricBreakpointItem [
 	self assert: item scope identicalTo: self
 ]
 
-{ #category : #'tests - initialization' }
+{ #category : 'tests - initialization' }
 StHaltBreakpointInspectionItemTest >> testNewObjectCentricVariableBreakpointItem [
 	|bp item|
 	bp := self variableBreakpoint.
@@ -94,7 +96,7 @@ StHaltBreakpointInspectionItemTest >> testNewObjectCentricVariableBreakpointItem
 	self assert: item scope identicalTo: self
 ]
 
-{ #category : #'tests - initialization' }
+{ #category : 'tests - initialization' }
 StHaltBreakpointInspectionItemTest >> testNewVariableBreakpointItem [
 	|bp item|
 	bp := self variableBreakpoint.
@@ -107,7 +109,7 @@ StHaltBreakpointInspectionItemTest >> testNewVariableBreakpointItem [
 	self assert: item type equals: Break printString
 ]
 
-{ #category : #'tests - printing' }
+{ #category : 'tests - printing' }
 StHaltBreakpointInspectionItemTest >> testPrintBreakpointItem [
 
 	|bp item|
@@ -124,7 +126,7 @@ StHaltBreakpointInspectionItemTest >> testPrintBreakpointItem [
 	self assert: item printScope equals: 'self'.
 ]
 
-{ #category : #'tests - printing' }
+{ #category : 'tests - printing' }
 StHaltBreakpointInspectionItemTest >> testPrintHaltItem [
 
 	| item |
@@ -140,7 +142,7 @@ StHaltBreakpointInspectionItemTest >> testPrintHaltItem [
 		equals: self haltNode methodNode methodClass printString
 ]
 
-{ #category : #'tests - printing' }
+{ #category : 'tests - printing' }
 StHaltBreakpointInspectionItemTest >> testPrintVariableBreakpointItem [
 
 	| bp item |
@@ -157,7 +159,7 @@ StHaltBreakpointInspectionItemTest >> testPrintVariableBreakpointItem [
 	self assert: item printScope equals: 'self'.
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 StHaltBreakpointInspectionItemTest >> variableBreakpoint [
 
 	^ StDummyTestClassWithHalts newBreakpointForVariable: #var
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StHaltCache.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StHaltCache.class.st
index c9e80b5a9..e8b54a842 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StHaltCache.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StHaltCache.class.st
@@ -12,8 +12,8 @@ However, it might be interesting if I evolve later, or if I need safe concurrent
 By default, the cache does not lookup halts in all the system's methods. This can be enabled in a settings under tools>debugging>halt cache. The cache must be refreshed to effectively perform the lookup (StHaltCache refresh).
 "
 Class {
-	#name : #StHaltCache,
-	#superclass : #Object,
+	#name : 'StHaltCache',
+	#superclass : 'Object',
 	#traits : 'TObservable',
 	#classTraits : 'TObservable classTrait',
 	#instVars : [
@@ -24,15 +24,17 @@ Class {
 	#classVars : [
 		'#DefaultCache'
 	],
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Model'
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Model',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Model'
 }
 
-{ #category : #'accessing - cache' }
+{ #category : 'accessing - cache' }
 StHaltCache class >> defaultCache [
 	^ DefaultCache ifNil: [ DefaultCache := self new ]
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StHaltCache class >> haltCacheSettingsOn: aBuilder [
 	<systemsettings>
 	(aBuilder group: #haltcache)
@@ -58,13 +60,13 @@ This can be slow for large systems (with lots of methods).' ];
 If deactivated, the list of halts will not be updated in the debugging tools browsers.' ]
 ]
 
-{ #category : #'accessing - cache' }
+{ #category : 'accessing - cache' }
 StHaltCache class >> refresh [
 	<script>
 	self defaultCache refreshCache
 ]
 
-{ #category : #'class initialization' }
+{ #category : 'class initialization' }
 StHaltCache class >> reset [
 	<script>
 	DefaultCache
@@ -72,14 +74,14 @@ StHaltCache class >> reset [
 			DefaultCache := nil ]
 ]
 
-{ #category : #cache }
+{ #category : 'cache' }
 StHaltCache >> buildCache [
 	self scanAllSystem ifFalse:[^self].
 	SystemNavigation new allHalts
 		do: [ :compiledMethod | self buildCacheForMethod: compiledMethod ]
 ]
 
-{ #category : #cache }
+{ #category : 'cache' }
 StHaltCache >> buildCacheForMethod: aCompiledMethod [
 	"- extract all halt nodes from the method's ast
 	- extract all nodes with installed breakpoints from the method's ast
@@ -98,18 +100,18 @@ StHaltCache >> buildCacheForMethod: aCompiledMethod [
 	self cacheChanged
 ]
 
-{ #category : #notifying }
+{ #category : 'notifying' }
 StHaltCache >> cacheChanged [
 	SystemAnnouncer uniqueInstance announce: StHaltCacheChanged
 ]
 
-{ #category : #cache }
+{ #category : 'cache' }
 StHaltCache >> cacheNode: aNode forSelector: aMethodSelector [
 	(methodsWithHalts at: aMethodSelector ifAbsentPut: IdentitySet new)
 		add: aNode
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StHaltCache >> initialize [
 	methodsWithHalts := Dictionary new.
 	self buildCache.
@@ -117,74 +119,74 @@ StHaltCache >> initialize [
 	self property: #isActive whenChangedDo: [ self updateSubscriptions ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltCache >> isActive [
 	^ isActive ifNil: [ isActive := false ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltCache >> isActive: aBoolean [
 	isActive := aBoolean
 ]
 
-{ #category : #notifying }
+{ #category : 'notifying' }
 StHaltCache >> methodAdded: methodAddedAnnouncement [
 	self buildCacheForMethod: methodAddedAnnouncement methodAdded
 ]
 
-{ #category : #notifying }
+{ #category : 'notifying' }
 StHaltCache >> methodChanged: methodCModifiedAnnouncement [
 	self buildCacheForMethod: methodCModifiedAnnouncement newMethod
 ]
 
-{ #category : #notifying }
+{ #category : 'notifying' }
 StHaltCache >> methodRemoved: methodRemovedAnnouncement [
 	self uncacheMethod: methodRemovedAnnouncement methodRemoved printString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltCache >> methodsWithHalts [
 	^ methodsWithHalts
 ]
 
-{ #category : #cache }
+{ #category : 'cache' }
 StHaltCache >> nodeCacheForSelector: aMethodSelector [
 	^ methodsWithHalts at: aMethodSelector ifAbsent: #()
 ]
 
-{ #category : #cache }
+{ #category : 'cache' }
 StHaltCache >> refreshCache [
 	self buildCache
 ]
 
-{ #category : #'system subscription' }
+{ #category : 'system subscription' }
 StHaltCache >> registerSubscriptions [
 	SystemAnnouncer uniqueInstance weak when: MethodModified send: #methodChanged: to: self.
 	SystemAnnouncer uniqueInstance weak when: MethodRemoved send: #methodRemoved: to: self.
 	SystemAnnouncer uniqueInstance weak when: MethodAdded send: #methodAdded: to: self
 ]
 
-{ #category : #'system subscription' }
+{ #category : 'system subscription' }
 StHaltCache >> removeSubscriptions [
 	SystemAnnouncer uniqueInstance unsubscribe: self
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltCache >> scanAllSystem [
 	^scanAllSystem ifNil:[scanAllSystem := false] 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltCache >> scanAllSystem: aBoolean [
 	scanAllSystem := aBoolean
 ]
 
-{ #category : #cache }
+{ #category : 'cache' }
 StHaltCache >> setNodeCache: haltAndBreakpointNodes forSelector: aSelector [
 	methodsWithHalts at: aSelector put: haltAndBreakpointNodes
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StHaltCache >> shouldConsiderHaltNode: aNode [
 	| selector shouldRejectNode |
 	selector := aNode selector.
@@ -194,7 +196,7 @@ StHaltCache >> shouldConsiderHaltNode: aNode [
 	^ shouldRejectNode not and: [ 'halt*' match: selector ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StHaltCache >> shouldConsiderMethod: aCompiledMethod [
 
 	"We do not consider test or debugging methods"
@@ -204,7 +206,7 @@ StHaltCache >> shouldConsiderMethod: aCompiledMethod [
 		  aCompiledMethod hasPragmaNamed: pragmaName ]
 ]
 
-{ #category : #cache }
+{ #category : 'cache' }
 StHaltCache >> uncacheMethod: aMethodSelector [
 	"Methods not in the cache are irrelevant, so we don't care if they are absent from the dictionary"
 
@@ -214,7 +216,7 @@ StHaltCache >> uncacheMethod: aMethodSelector [
 	self cacheChanged
 ]
 
-{ #category : #'system subscription' }
+{ #category : 'system subscription' }
 StHaltCache >> updateSubscriptions [
 	self isActive ifTrue: [ ^ self registerSubscriptions ].
 	^ self removeSubscriptions
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StHaltCacheChanged.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StHaltCacheChanged.class.st
index 6150442d5..2542739d5 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StHaltCacheChanged.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StHaltCacheChanged.class.st
@@ -2,7 +2,9 @@
 Simple announcement to signal any update in the halt cache
 "
 Class {
-	#name : #StHaltCacheChanged,
-	#superclass : #Announcement,
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Model'
+	#name : 'StHaltCacheChanged',
+	#superclass : 'Announcement',
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Model',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Model'
 }
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StHaltCacheTest.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StHaltCacheTest.class.st
index 4abe11b89..154092993 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StHaltCacheTest.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StHaltCacheTest.class.st
@@ -1,10 +1,12 @@
 Class {
-	#name : #StHaltCacheTest,
-	#superclass : #StHaltAndBreakpointControlTest,
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Tests'
+	#name : 'StHaltCacheTest',
+	#superclass : 'StHaltAndBreakpointControlTest',
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Tests',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Tests'
 }
 
-{ #category : #'tests - halts cache' }
+{ #category : 'tests - halts cache' }
 StHaltCacheTest >> testAddingHaltToMethod [
 	| nodeCacheForSimpleHalt originalNodeCacheSize |
 	nodeCacheForSimpleHalt := cache
@@ -27,7 +29,7 @@ StHaltCacheTest >> testAddingHaltToMethod [
 		equals: 1
 ]
 
-{ #category : #'tests - cache initialization' }
+{ #category : 'tests - cache initialization' }
 StHaltCacheTest >> testCacheActivation [
 	cache removeSubscriptions.
 	cache := StHaltCache new.
@@ -36,7 +38,7 @@ StHaltCacheTest >> testCacheActivation [
 	self assert: (SystemAnnouncer uniqueInstance hasSubscriber: cache) 
 ]
 
-{ #category : #'tests - cache initialization' }
+{ #category : 'tests - cache initialization' }
 StHaltCacheTest >> testCacheDectivation [
 	cache removeSubscriptions.
 	cache := StHaltCache new.
@@ -46,14 +48,14 @@ StHaltCacheTest >> testCacheDectivation [
 	self deny: (SystemAnnouncer uniqueInstance hasSubscriber: cache) 
 ]
 
-{ #category : #'tests - cache initialization' }
+{ #category : 'tests - cache initialization' }
 StHaltCacheTest >> testInitialActivation [
 	cache := StHaltCache new.
 	self deny: cache isActive.
 	self deny: (SystemAnnouncer uniqueInstance hasSubscriber: cache) 
 ]
 
-{ #category : #'tests - cache building' }
+{ #category : 'tests - cache building' }
 StHaltCacheTest >> testInitialCacheBuild [
 	self assert: cache methodsWithHalts size equals: 6.
 	(self testClass methods
@@ -72,7 +74,7 @@ StHaltCacheTest >> testInitialCacheBuild [
 				identicalTo: haltNode ]
 ]
 
-{ #category : #'tests - halts cache' }
+{ #category : 'tests - halts cache' }
 StHaltCacheTest >> testMethodWithHaltRemoval [
 	|methodCacheForSimpleHalt |
 	methodCacheForSimpleHalt := cache methodsWithHalts size.
@@ -83,7 +85,7 @@ StHaltCacheTest >> testMethodWithHaltRemoval [
 		(cache methodsWithHalts keys select:[:methodSelector| methodSelector = 'StDummyTestClassWithHalts>>#mHalt']) isEmpty
 ]
 
-{ #category : #'tests - halts cache' }
+{ #category : 'tests - halts cache' }
 StHaltCacheTest >> testNewMethodWithHalt [
 	|methodCacheForSimpleHalt haltNode|
 	methodCacheForSimpleHalt := cache methodsWithHalts size.
@@ -97,7 +99,7 @@ StHaltCacheTest >> testNewMethodWithHalt [
 
 ]
 
-{ #category : #'tests - cache building' }
+{ #category : 'tests - cache building' }
 StHaltCacheTest >> testRefreshCacheWithScanAllSystem [
 	|newCache|
 	newCache := StHaltCache new.
@@ -106,7 +108,7 @@ StHaltCacheTest >> testRefreshCacheWithScanAllSystem [
 	self assert: cache methodsWithHalts size >= 6
 ]
 
-{ #category : #'tests - cache building' }
+{ #category : 'tests - cache building' }
 StHaltCacheTest >> testRefreshCacheWithoutScanAllSystem [
 	|newCache|
 	newCache := StHaltCache new.
@@ -114,7 +116,7 @@ StHaltCacheTest >> testRefreshCacheWithoutScanAllSystem [
 	self assert: newCache methodsWithHalts isEmpty
 ]
 
-{ #category : #'tests - halts cache' }
+{ #category : 'tests - halts cache' }
 StHaltCacheTest >> testRemoveAllHaltsFromMethod [
 	| methodCacheForSimpleHalt |
 	methodCacheForSimpleHalt := cache methodsWithHalts size.
@@ -130,14 +132,14 @@ StHaltCacheTest >> testRemoveAllHaltsFromMethod [
 				isEmpty
 ]
 
-{ #category : #'tests - cache building' }
+{ #category : 'tests - cache building' }
 StHaltCacheTest >> testScanAllSystemDisabled [
 	|newCache|
 	newCache := StHaltCache new.
 	self assert: newCache methodsWithHalts isEmpty
 ]
 
-{ #category : #'tests - cache building' }
+{ #category : 'tests - cache building' }
 StHaltCacheTest >> testScanAllSystemEnabled [
 	|newCache|
 	newCache := StHaltCache basicNew.
@@ -146,7 +148,7 @@ StHaltCacheTest >> testScanAllSystemEnabled [
 	self assert: cache methodsWithHalts size >= 6
 ]
 
-{ #category : #'tests - halts cache' }
+{ #category : 'tests - halts cache' }
 StHaltCacheTest >> testShouldConsiderHaltNode [
 	| node |
 	node := RBMessageNode receiver: RBVariableNode selfNode selector: #haltOnAccessTo.
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StHaltInspectionItem.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StHaltInspectionItem.class.st
index c4266a3fc..d628d2f5c 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StHaltInspectionItem.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StHaltInspectionItem.class.st
@@ -2,8 +2,8 @@
 I am a data holder for halts and breakpoints to be displayed in StObjectBreakpointInspection tables.
 "
 Class {
-	#name : #StHaltInspectionItem,
-	#superclass : #Object,
+	#name : 'StHaltInspectionItem',
+	#superclass : 'Object',
 	#instVars : [
 		'node',
 		'type',
@@ -11,41 +11,43 @@ Class {
 		'displayEntity',
 		'scope'
 	],
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Presenters'
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Presenters',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Presenters'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StHaltInspectionItem class >> forBreakpoint: aBreakpoint [ 
 	^StBreakpointInspectionItem new forBreakpoint: aBreakpoint 
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StHaltInspectionItem class >> forHalt: aRBMessageNode [ 
 	^self new forHalt: aRBMessageNode
 ]
 
-{ #category : #control }
+{ #category : 'control' }
 StHaltInspectionItem >> disableInContext: aStHaltAndBreakpointController [ 
 	aStHaltAndBreakpointController disableHaltNode: node
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltInspectionItem >> displayEntity [
 	^ displayEntity
 ]
 
-{ #category : #control }
+{ #category : 'control' }
 StHaltInspectionItem >> enableInContext: aStHaltAndBreakpointController [ 
 	aStHaltAndBreakpointController enableHaltNode: node
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltInspectionItem >> entityToBrowse [
 
 	^ node methodNode method
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StHaltInspectionItem >> forHalt: aRBMessageNode [ 
 	node := aRBMessageNode.
 	type := Halt name asString.
@@ -54,74 +56,74 @@ StHaltInspectionItem >> forHalt: aRBMessageNode [
 	displayEntity := aRBMessageNode methodNode
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltInspectionItem >> interval [
 	^ interval
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltInspectionItem >> interval: anObject [
 	interval := anObject
 ]
 
-{ #category : #control }
+{ #category : 'control' }
 StHaltInspectionItem >> isEnabledInContext: aStHaltAndBreakpointController [ 
 	^aStHaltAndBreakpointController isHaltNodeEnabled: node
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltInspectionItem >> node [
 	^ node
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltInspectionItem >> node: anObject [
 	node := anObject
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StHaltInspectionItem >> printContents [
 	^displayEntity sourceCode
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StHaltInspectionItem >> printEntity [
 
 	^ displayEntity compiledMethod printString
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StHaltInspectionItem >> printScope [
 
 	^ scope printString
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StHaltInspectionItem >> removeInPresenterContext: aStObjectBreakpointInspection [ 
 	self inform: 'Edit your code to remove halts'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltInspectionItem >> scope [
 	^ scope
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltInspectionItem >> scope: anObject [
 	scope := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltInspectionItem >> type [
 	^ type
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHaltInspectionItem >> type: anObject [
 	type := anObject
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StHaltInspectionItem >> updateSourceCodePaneFor: aStObjectBreakpointInspection [ 
 	aStObjectBreakpointInspection updateSourceCodeForHaltItem: self
 ]
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StObjectBreakpointInspection.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StObjectBreakpointInspection.class.st
index 1c3a29e3d..58365d932 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StObjectBreakpointInspection.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StObjectBreakpointInspection.class.st
@@ -2,17 +2,19 @@
 I am an inspection for halts and breakpoints, my scope is the inspected object.
 "
 Class {
-	#name : #StObjectBreakpointInspection,
-	#superclass : #StInspectionPresenter,
+	#name : 'StObjectBreakpointInspection',
+	#superclass : 'StInspectionPresenter',
 	#instVars : [
 		'methodsWithBreakpoints',
 		'breakpointsInSourceCode',
 		'breakpointController'
 	],
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Presenters'
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Presenters',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Presenters'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 StObjectBreakpointInspection class >> defaultLayout [
 
 	^ SpPanedLayout newTopToBottom
@@ -21,13 +23,13 @@ StObjectBreakpointInspection class >> defaultLayout [
 		yourself
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StObjectBreakpointInspection >> breakpointsForModel [
 
 	^ Breakpoint all select: [ :bp | bp scopeIncludes: model ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StObjectBreakpointInspection >> buildBreakpointData [
 	^ (self breakpointsForModel
 		collect: [ :b | StBreakpointInspectionItem forBreakpoint: b ])
@@ -40,7 +42,7 @@ StObjectBreakpointInspection >> buildBreakpointData [
 						or: [ breakpoint isVariableBreakpoint ] ] ]"
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StObjectBreakpointInspection >> buildHaltAndBreakpointData [
 	| breakpointData |
 	breakpointData := OrderedCollection new."SortedCollection
@@ -50,7 +52,7 @@ StObjectBreakpointInspection >> buildHaltAndBreakpointData [
 	^ breakpointData
 ]
 
-{ #category : #presenters }
+{ #category : 'presenters' }
 StObjectBreakpointInspection >> buildHaltAndBreakpointTable [
 	"List of methods in which a breakpoint is installed"
 
@@ -84,7 +86,7 @@ StObjectBreakpointInspection >> buildHaltAndBreakpointTable [
 		contextMenu: self rootCommandsGroup asMenuPresenter
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StObjectBreakpointInspection >> buildHaltData [
 
 	^ (model class allMethods flatCollect: [ :m | 
@@ -93,7 +95,7 @@ StObjectBreakpointInspection >> buildHaltData [
 		  StHaltInspectionItem forHalt: node ]
 ]
 
-{ #category : #presenters }
+{ #category : 'presenters' }
 StObjectBreakpointInspection >> buildSourceCode [
 	"Source code of methods in which breakpoint are installed"
 
@@ -101,12 +103,12 @@ StObjectBreakpointInspection >> buildSourceCode [
 	breakpointsInSourceCode beNotEditable
 ]
 
-{ #category : #presenters }
+{ #category : 'presenters' }
 StObjectBreakpointInspection >> buildTableData [
 	methodsWithBreakpoints items: self buildHaltAndBreakpointData
 ]
 
-{ #category : #presenters }
+{ #category : 'presenters' }
 StObjectBreakpointInspection >> configureSourceCodeUpdate [
 
 	methodsWithBreakpoints whenSelectionChangedDo: [ :selection | 
@@ -117,13 +119,13 @@ StObjectBreakpointInspection >> configureSourceCodeUpdate [
 			selectedItem updateSourceCodePaneFor: self ] ]
 ]
 
-{ #category : #breakpoints }
+{ #category : 'breakpoints' }
 StObjectBreakpointInspection >> disableHaltOrBreakpointFor: haltOrBreakpointItem [
 
 	breakpointController disableHaltOrBreakpointFor: haltOrBreakpointItem
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StObjectBreakpointInspection >> doBrowseBreakpointMethod [
 	| entityToBrowse |
 	
@@ -131,26 +133,26 @@ StObjectBreakpointInspection >> doBrowseBreakpointMethod [
 	self systemNavigation browse: entityToBrowse.
 ]
 
-{ #category : #breakpoints }
+{ #category : 'breakpoints' }
 StObjectBreakpointInspection >> enableHaltOrBreakpointFor: haltOrBreakpointItem [
 
 	breakpointController enableHaltOrBreakpointFor: haltOrBreakpointItem
 ]
 
-{ #category : #breakpoints }
+{ #category : 'breakpoints' }
 StObjectBreakpointInspection >> haltOrBreakpoinsEnabledFor: haltOrBreakpointItem [
 
 	^ breakpointController isHaltOrBreakpointEnabled:
 		  haltOrBreakpointItem
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StObjectBreakpointInspection >> initialize [
 	breakpointController := StHaltAndBreakpointController new.
 	super initialize
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StObjectBreakpointInspection >> initializePresenters [
 	self buildSourceCode.
 	self buildHaltAndBreakpointTable.
@@ -160,14 +162,14 @@ StObjectBreakpointInspection >> initializePresenters [
 	SystemAnnouncer uniqueInstance weak when: BreakpointAdded send: #buildTableData to: self
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StObjectBreakpointInspection >> initializeWindow: aWindowPresenter [
 	super initializeWindow: aWindowPresenter.
 	aWindowPresenter
 		whenClosedDo: [ SystemAnnouncer uniqueInstance unsubscribe: self ]
 ]
 
-{ #category : #breakpoints }
+{ #category : 'breakpoints' }
 StObjectBreakpointInspection >> isBreakpointObjectCentric: breakpointData [
 	| breakpoint |
 	breakpoint := breakpointData at: #breakpoint ifAbsent: [ ^ false ].
@@ -175,7 +177,7 @@ StObjectBreakpointInspection >> isBreakpointObjectCentric: breakpointData [
 		and: [ breakpoint isVariableBreakpoint not ]
 ]
 
-{ #category : #presenters }
+{ #category : 'presenters' }
 StObjectBreakpointInspection >> labelForHaltSelector: aSelector [
 	"This was intended to be used to display more precise information about the kind of halt we display in the presenter."
 	self flag: 'Not used yet. Kept as documentation for further use'.
@@ -188,17 +190,17 @@ StObjectBreakpointInspection >> labelForHaltSelector: aSelector [
 	^ 'always'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StObjectBreakpointInspection >> methodsWithBreakpoints [
 	^ methodsWithBreakpoints
 ]
 
-{ #category : #'system subscription' }
+{ #category : 'system subscription' }
 StObjectBreakpointInspection >> unsubscribeFromCacheChanges [
 	SystemAnnouncer uniqueInstance unsubscribe: self
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StObjectBreakpointInspection >> updateSourceCodeForBreakpointItem: aStBreakpointInspectionItem [
 
 	"Halts and standard breakpoints items both behave the same"
@@ -206,7 +208,7 @@ StObjectBreakpointInspection >> updateSourceCodeForBreakpointItem: aStBreakpoint
 	self updateSourceCodeForHaltItem: aStBreakpointInspectionItem
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StObjectBreakpointInspection >> updateSourceCodeForHaltItem: aStHaltInspectionItem [
 
 	breakpointsInSourceCode withLineNumbers.
@@ -215,7 +217,7 @@ StObjectBreakpointInspection >> updateSourceCodeForHaltItem: aStHaltInspectionIt
 	breakpointsInSourceCode beForBehavior: model class
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StObjectBreakpointInspection >> updateSourceCodeForVariableBreakpointItem: aStBreakpointInspectionItem [
 
 	breakpointsInSourceCode
@@ -224,7 +226,7 @@ StObjectBreakpointInspection >> updateSourceCodeForVariableBreakpointItem: aStBr
 	breakpointsInSourceCode beForBehavior: model class
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StObjectBreakpointInspection >> windowIsClosing [
 	^ self unsubscribeFromCacheChanges
 ]
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StObjectBreakpointInspectionTest.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StObjectBreakpointInspectionTest.class.st
index cc73648e1..6bebe61fc 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StObjectBreakpointInspectionTest.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StObjectBreakpointInspectionTest.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #StObjectBreakpointInspectionTest,
-	#superclass : #TestCase,
+	#name : 'StObjectBreakpointInspectionTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'breakpoint1',
 		'breakpoint2',
@@ -9,24 +9,26 @@ Class {
 		'breakpoint3',
 		'breakpoint4'
 	],
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Tests'
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Tests',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Tests'
 }
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 StObjectBreakpointInspectionTest >> compileHelperMethods [
 
 	StDummyTestClassWithHalts compile: 'varRead ^var'.
 	StDummyTestClassWithHalts compile: 'varWrite var := 0'
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 StObjectBreakpointInspectionTest >> removeHelperMethods [
 
 	StDummyTestClassWithHalts removeSelector: #varRead.
 	StDummyTestClassWithHalts removeSelector: #varWrite
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StObjectBreakpointInspectionTest >> setUp [
 	super setUp.
 	self removeHelperMethods.
@@ -44,7 +46,7 @@ StObjectBreakpointInspectionTest >> setUp [
 	
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StObjectBreakpointInspectionTest >> tearDown [
 	breakpoint1 ifNotNil: [ breakpoint1 remove ].
 	breakpoint2 ifNotNil: [ breakpoint2 remove ].
@@ -54,7 +56,7 @@ StObjectBreakpointInspectionTest >> tearDown [
 	super tearDown
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StObjectBreakpointInspectionTest >> testAllBreakpointsForModel [
 
 	inspection := StObjectBreakpointInspection basicNew model: instance.
@@ -65,7 +67,7 @@ StObjectBreakpointInspectionTest >> testAllBreakpointsForModel [
 			breakpoint4 } asOrderedCollection
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StObjectBreakpointInspectionTest >> testBreakpointsForModel [
 
 	inspection := StObjectBreakpointInspection basicNew model:
@@ -75,7 +77,7 @@ StObjectBreakpointInspectionTest >> testBreakpointsForModel [
 			breakpoint2 } asOrderedCollection
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StObjectBreakpointInspectionTest >> testObjectCentricBreakpointsForModel [
 
 	breakpoint1 remove.
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/StRemoveBreakpointCommand.class.st b/src/NewTools-Debugger-Breakpoints-Tools/StRemoveBreakpointCommand.class.st
index 2fce5182c..dfbdb3ebc 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/StRemoveBreakpointCommand.class.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/StRemoveBreakpointCommand.class.st
@@ -2,17 +2,19 @@
 Removes a breakpoint from a selected breakpoint item in a StObjectBreakpointInspection. 
 "
 Class {
-	#name : #StRemoveBreakpointCommand,
-	#superclass : #SpToolCommand,
-	#category : #'NewTools-Debugger-Breakpoints-Tools-Model'
+	#name : 'StRemoveBreakpointCommand',
+	#superclass : 'SpToolCommand',
+	#category : 'NewTools-Debugger-Breakpoints-Tools-Model',
+	#package : 'NewTools-Debugger-Breakpoints-Tools',
+	#tag : 'Model'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StRemoveBreakpointCommand class >> defaultName [
 	^'Remove'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StRemoveBreakpointCommand >> execute [
 
 	(self transform value: self context) removeInPresenterContext:
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/VariableBreakpoint.extension.st b/src/NewTools-Debugger-Breakpoints-Tools/VariableBreakpoint.extension.st
index a8bd2868b..48e875646 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/VariableBreakpoint.extension.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/VariableBreakpoint.extension.st
@@ -1,11 +1,11 @@
-Extension { #name : #VariableBreakpoint }
+Extension { #name : 'VariableBreakpoint' }
 
-{ #category : #'*NewTools-Debugger-Breakpoints-Tools' }
+{ #category : '*NewTools-Debugger-Breakpoints-Tools' }
 VariableBreakpoint >> asBreakpointInspectionItemIn: aStBreakpointInspectionItem [ 
 	^aStBreakpointInspectionItem buildVariableBreakpointItemFor: self
 ]
 
-{ #category : #'*NewTools-Debugger-Breakpoints-Tools' }
+{ #category : '*NewTools-Debugger-Breakpoints-Tools' }
 VariableBreakpoint >> printContentsForBreakpointInspection [
 
 	| str |
@@ -32,7 +32,7 @@ VariableBreakpoint >> printContentsForBreakpointInspection [
 	^ str contents
 ]
 
-{ #category : #'*NewTools-Debugger-Breakpoints-Tools' }
+{ #category : '*NewTools-Debugger-Breakpoints-Tools' }
 VariableBreakpoint >> printTargetForBreakpointInspection [
 
 	| str |
@@ -53,7 +53,7 @@ VariableBreakpoint >> printTargetForBreakpointInspection [
 	^ str contents
 ]
 
-{ #category : #'*NewTools-Debugger-Breakpoints-Tools' }
+{ #category : '*NewTools-Debugger-Breakpoints-Tools' }
 VariableBreakpoint >> scopeIncludes: anObject [
 
 	| classScope |
diff --git a/src/NewTools-Debugger-Breakpoints-Tools/package.st b/src/NewTools-Debugger-Breakpoints-Tools/package.st
index f817e535d..7c5b2ed82 100644
--- a/src/NewTools-Debugger-Breakpoints-Tools/package.st
+++ b/src/NewTools-Debugger-Breakpoints-Tools/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Debugger-Breakpoints-Tools' }
+Package { #name : 'NewTools-Debugger-Breakpoints-Tools' }
diff --git a/src/NewTools-Debugger-Extensions/DebugSession.extension.st b/src/NewTools-Debugger-Extensions/DebugSession.extension.st
index 859ca07e0..9c1d1d77c 100644
--- a/src/NewTools-Debugger-Extensions/DebugSession.extension.st
+++ b/src/NewTools-Debugger-Extensions/DebugSession.extension.st
@@ -1,17 +1,17 @@
-Extension { #name : #DebugSession }
+Extension { #name : 'DebugSession' }
 
-{ #category : #'*NewTools-Debugger-Extensions' }
+{ #category : '*NewTools-Debugger-Extensions' }
 DebugSession >> browse: aContext [
 
 	aContext method browse
 ]
 
-{ #category : #'*NewTools-Debugger-Extensions' }
+{ #category : '*NewTools-Debugger-Extensions' }
 DebugSession >> shortStack [
 	^self stackOfSize: self shortStackSize
 ]
 
-{ #category : #'*NewTools-Debugger-Extensions' }
+{ #category : '*NewTools-Debugger-Extensions' }
 DebugSession >> shortStackSize [
 	^ 20
 ]
diff --git a/src/NewTools-Debugger-Extensions/Exception.extension.st b/src/NewTools-Debugger-Extensions/Exception.extension.st
index 16cfdf1b1..f91146632 100644
--- a/src/NewTools-Debugger-Extensions/Exception.extension.st
+++ b/src/NewTools-Debugger-Extensions/Exception.extension.st
@@ -1,12 +1,12 @@
-Extension { #name : #Exception }
+Extension { #name : 'Exception' }
 
-{ #category : #'*NewTools-Debugger-Extensions' }
+{ #category : '*NewTools-Debugger-Extensions' }
 Exception >> signalContext [
 
 	^ signalContext
 ]
 
-{ #category : #'*NewTools-Debugger-Extensions' }
+{ #category : '*NewTools-Debugger-Extensions' }
 Exception >> stDebuggerInspectorNodesFor: aStDebuggerContext [
 
 	^ aStDebuggerContext exceptionNodesFor: self
diff --git a/src/NewTools-Debugger-Extensions/MessageNotUnderstood.extension.st b/src/NewTools-Debugger-Extensions/MessageNotUnderstood.extension.st
index 87b7990f6..2639a90d2 100644
--- a/src/NewTools-Debugger-Extensions/MessageNotUnderstood.extension.st
+++ b/src/NewTools-Debugger-Extensions/MessageNotUnderstood.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #MessageNotUnderstood }
+Extension { #name : 'MessageNotUnderstood' }
 
-{ #category : #'*NewTools-Debugger-Extensions' }
+{ #category : '*NewTools-Debugger-Extensions' }
 MessageNotUnderstood >> stDebuggerInspectorNodesFor: aStDebuggerContext [
 
 	^ aStDebuggerContext doesNotUnderstandNodesFor: self
diff --git a/src/NewTools-Debugger-Extensions/OupsNullException.extension.st b/src/NewTools-Debugger-Extensions/OupsNullException.extension.st
index d060f87de..bc26b6f7f 100644
--- a/src/NewTools-Debugger-Extensions/OupsNullException.extension.st
+++ b/src/NewTools-Debugger-Extensions/OupsNullException.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #OupsNullException }
+Extension { #name : 'OupsNullException' }
 
-{ #category : #'*NewTools-Debugger-Extensions' }
+{ #category : '*NewTools-Debugger-Extensions' }
 OupsNullException >> stDebuggerInspectorNodesFor: aStDebuggerContext [
 
 	^ aStDebuggerContext nullExceptionNodesFor: self
diff --git a/src/NewTools-Debugger-Extensions/RBProgramNode.extension.st b/src/NewTools-Debugger-Extensions/RBProgramNode.extension.st
index 7d976cf5b..994e39d52 100644
--- a/src/NewTools-Debugger-Extensions/RBProgramNode.extension.st
+++ b/src/NewTools-Debugger-Extensions/RBProgramNode.extension.st
@@ -1,11 +1,11 @@
-Extension { #name : #RBProgramNode }
+Extension { #name : 'RBProgramNode' }
 
-{ #category : #'*NewTools-Debugger-Extensions' }
+{ #category : '*NewTools-Debugger-Extensions' }
 RBProgramNode >> enableHalts: aBoolean [
 	^self propertyAt: #enabledForHaltOrBreakpoint put: aBoolean
 ]
 
-{ #category : #'*NewTools-Debugger-Extensions' }
+{ #category : '*NewTools-Debugger-Extensions' }
 RBProgramNode >> enabledForHaltOrBreakpoint [
 	^self propertyAt: #enabledForHaltOrBreakpoint ifAbsent: [ true ]
 ]
diff --git a/src/NewTools-Debugger-Extensions/SpCodeInteractionModel.extension.st b/src/NewTools-Debugger-Extensions/SpCodeInteractionModel.extension.st
index b518a1940..440c22289 100644
--- a/src/NewTools-Debugger-Extensions/SpCodeInteractionModel.extension.st
+++ b/src/NewTools-Debugger-Extensions/SpCodeInteractionModel.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #SpCodeInteractionModel }
+Extension { #name : 'SpCodeInteractionModel' }
 
-{ #category : #'*NewTools-Debugger-Extensions' }
+{ #category : '*NewTools-Debugger-Extensions' }
 SpCodeInteractionModel >> hasUnsavedCodeChanges [
 	^false
 ]
diff --git a/src/NewTools-Debugger-Extensions/SystemNavigation.extension.st b/src/NewTools-Debugger-Extensions/SystemNavigation.extension.st
index 20d191a79..50f7505c8 100644
--- a/src/NewTools-Debugger-Extensions/SystemNavigation.extension.st
+++ b/src/NewTools-Debugger-Extensions/SystemNavigation.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #SystemNavigation }
+Extension { #name : 'SystemNavigation' }
 
-{ #category : #'*NewTools-Debugger-Extensions' }
+{ #category : '*NewTools-Debugger-Extensions' }
 SystemNavigation >> allHalts [
 
 	^ self allBehaviors
diff --git a/src/NewTools-Debugger-Extensions/package.st b/src/NewTools-Debugger-Extensions/package.st
index e015c45aa..644725bf2 100644
--- a/src/NewTools-Debugger-Extensions/package.st
+++ b/src/NewTools-Debugger-Extensions/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Debugger-Extensions' }
+Package { #name : 'NewTools-Debugger-Extensions' }
diff --git a/src/NewTools-Debugger-Fuel-Tests/FLDebuggerStackSerializerTest.class.st b/src/NewTools-Debugger-Fuel-Tests/FLDebuggerStackSerializerTest.class.st
index bbb7728b6..9f246bb7f 100644
--- a/src/NewTools-Debugger-Fuel-Tests/FLDebuggerStackSerializerTest.class.st
+++ b/src/NewTools-Debugger-Fuel-Tests/FLDebuggerStackSerializerTest.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #FLDebuggerStackSerializerTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-Debugger-Fuel-Tests'
+	#name : 'FLDebuggerStackSerializerTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-Debugger-Fuel-Tests',
+	#package : 'NewTools-Debugger-Fuel-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 FLDebuggerStackSerializerTest >> testFileNameForContext [
 	| stackSerializer context fileName |
 	stackSerializer := FLDebuggerStackSerializer new.
@@ -18,7 +19,7 @@ FLDebuggerStackSerializerTest >> testFileNameForContext [
 		 , '-*.fuel' match: fileName)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FLDebuggerStackSerializerTest >> testSerializeContextToFileNamed [
 	| context file |
 	context := [  ] asContext.
@@ -36,7 +37,7 @@ FLDebuggerStackSerializerTest >> testSerializeContextToFileNamed [
 		raise: FLDebuggerStackMaterialization
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FLDebuggerStackSerializerTest >> testSerializeStackFromContext [
 	| stackSerializer context |
 	stackSerializer := FLDebuggerStackSerializer new.
diff --git a/src/NewTools-Debugger-Fuel-Tests/package.st b/src/NewTools-Debugger-Fuel-Tests/package.st
index a7db5eb79..68bdb8f95 100644
--- a/src/NewTools-Debugger-Fuel-Tests/package.st
+++ b/src/NewTools-Debugger-Fuel-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Debugger-Fuel-Tests' }
+Package { #name : 'NewTools-Debugger-Fuel-Tests' }
diff --git a/src/NewTools-Debugger-Fuel/FLDebuggerStackMaterialization.class.st b/src/NewTools-Debugger-Fuel/FLDebuggerStackMaterialization.class.st
index 94626a2e7..7b2bc20be 100644
--- a/src/NewTools-Debugger-Fuel/FLDebuggerStackMaterialization.class.st
+++ b/src/NewTools-Debugger-Fuel/FLDebuggerStackMaterialization.class.st
@@ -2,15 +2,16 @@
 I am signalled when a dead stack is materialized from Fuel. My default action is to directly request the opening of a debugger on the post-mortem stack.
 "
 Class {
-	#name : #FLDebuggerStackMaterialization,
-	#superclass : #Exception,
+	#name : 'FLDebuggerStackMaterialization',
+	#superclass : 'Exception',
 	#instVars : [
 		'interruptedContext'
 	],
-	#category : #'NewTools-Debugger-Fuel'
+	#category : 'NewTools-Debugger-Fuel',
+	#package : 'NewTools-Debugger-Fuel'
 }
 
-{ #category : #handling }
+{ #category : 'handling' }
 FLDebuggerStackMaterialization >> defaultAction [ 
 	(OupsDebugRequest newForContext: interruptedContext)
 		process: thisProcess;
@@ -18,7 +19,7 @@ FLDebuggerStackMaterialization >> defaultAction [
 		submit
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FLDebuggerStackMaterialization >> interruptedContext: anObject [
 	interruptedContext := anObject
 ]
diff --git a/src/NewTools-Debugger-Fuel/FLDebuggerStackSerializer.class.st b/src/NewTools-Debugger-Fuel/FLDebuggerStackSerializer.class.st
index 1334b4a86..f4c338ee4 100644
--- a/src/NewTools-Debugger-Fuel/FLDebuggerStackSerializer.class.st
+++ b/src/NewTools-Debugger-Fuel/FLDebuggerStackSerializer.class.st
@@ -2,27 +2,28 @@
 Serializes a debugger stack using fuel.
 "
 Class {
-	#name : #FLDebuggerStackSerializer,
-	#superclass : #FLSerializer,
+	#name : 'FLDebuggerStackSerializer',
+	#superclass : 'FLSerializer',
 	#instVars : [
 		'fileName'
 	],
-	#category : #'NewTools-Debugger-Fuel'
+	#category : 'NewTools-Debugger-Fuel',
+	#package : 'NewTools-Debugger-Fuel'
 }
 
-{ #category : #serializing }
+{ #category : 'serializing' }
 FLDebuggerStackSerializer class >> serializeStackFromContext: aContext [
 
 	^ self new serializeStackFromContext: aContext
 ]
 
-{ #category : #serializing }
+{ #category : 'serializing' }
 FLDebuggerStackSerializer class >> serializeStackFromContext: aContext toFileNamed: aFileName [
 
 	^ self new serializeStackFromContext: aContext toFileNamed: aFileName
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 FLDebuggerStackSerializer >> encodeDebugInformation [
 	self
 		at: #Timestamp putAdditionalObject: self timestampString;
@@ -30,12 +31,12 @@ FLDebuggerStackSerializer >> encodeDebugInformation [
 		at: #Image putAdditionalObject: self imageInformationString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FLDebuggerStackSerializer >> fileName [
 	^ fileName
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 FLDebuggerStackSerializer >> fileNameForContext: aContext [
 	| date |
 	date := DateAndTime now.
@@ -51,7 +52,7 @@ FLDebuggerStackSerializer >> fileNameForContext: aContext [
 		s << '.fuel' ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 FLDebuggerStackSerializer >> imageInformationString [
 	^ String streamContents: [ :stringStream |
 		stringStream	
@@ -62,7 +63,7 @@ FLDebuggerStackSerializer >> imageInformationString [
 			nextPutAll: ']' ]
 ]
 
-{ #category : #serializing }
+{ #category : 'serializing' }
 FLDebuggerStackSerializer >> serializeStackFromContext: aContext [
 	fileName := self fileNameForContext: aContext.
 	self
@@ -72,7 +73,7 @@ FLDebuggerStackSerializer >> serializeStackFromContext: aContext [
 	^ fileName 
 ]
 
-{ #category : #serializing }
+{ #category : 'serializing' }
 FLDebuggerStackSerializer >> serializeStackFromContext: aContext toFileNamed: aFileName [
 	self
 		encodeDebugInformation;
@@ -87,7 +88,7 @@ FLDebuggerStackSerializer >> serializeStackFromContext: aContext toFileNamed: aF
 	^ aFileName
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 FLDebuggerStackSerializer >> timestampString [
 	^ String streamContents: [ :stringStream |
 		stringStream
@@ -96,7 +97,7 @@ FLDebuggerStackSerializer >> timestampString [
 			print: Time now ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 FLDebuggerStackSerializer >> vmInformationString [
 	^ String streamContents: [ :stringStream |
 		stringStream
diff --git a/src/NewTools-Debugger-Fuel/StDebugger.extension.st b/src/NewTools-Debugger-Fuel/StDebugger.extension.st
index 4f61bcf02..890d2ff9c 100644
--- a/src/NewTools-Debugger-Fuel/StDebugger.extension.st
+++ b/src/NewTools-Debugger-Fuel/StDebugger.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #StDebugger }
+Extension { #name : 'StDebugger' }
 
-{ #category : #'*NewTools-Debugger-Fuel' }
+{ #category : '*NewTools-Debugger-Fuel' }
 StDebugger class >> fuelOutStackCommandWith: aPresenter forRootGroup: aCmCommandsGroup [
 	<extensionCommands>
 	| command stackGroupName stackGroup |
diff --git a/src/NewTools-Debugger-Fuel/StFuelOutStackCommand.class.st b/src/NewTools-Debugger-Fuel/StFuelOutStackCommand.class.st
index 6889de3f9..942512317 100644
--- a/src/NewTools-Debugger-Fuel/StFuelOutStackCommand.class.st
+++ b/src/NewTools-Debugger-Fuel/StFuelOutStackCommand.class.st
@@ -2,37 +2,38 @@
 Serializes a portion of the current stack trace using fuel.
 "
 Class {
-	#name : #StFuelOutStackCommand,
-	#superclass : #StDebuggerCommand,
-	#category : #'NewTools-Debugger-Fuel'
+	#name : 'StFuelOutStackCommand',
+	#superclass : 'StDebuggerCommand',
+	#category : 'NewTools-Debugger-Fuel',
+	#package : 'NewTools-Debugger-Fuel'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFuelOutStackCommand class >> defaultDescription [
 	^ 'Serialize a portion of the current stack trace using fuel.'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFuelOutStackCommand class >> defaultIconName [
 	^ #smallExport
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFuelOutStackCommand class >> defaultName [	
 	^ 'Fuel out stack'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFuelOutStackCommand class >> defaultShortcut [
 	^ nil
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFuelOutStackCommand >> appliesTo: aDebugger [
 	^ true
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StFuelOutStackCommand >> execute [
 
 	| fileName |
diff --git a/src/NewTools-Debugger-Fuel/package.st b/src/NewTools-Debugger-Fuel/package.st
index eec8bc29f..722a52c9d 100644
--- a/src/NewTools-Debugger-Fuel/package.st
+++ b/src/NewTools-Debugger-Fuel/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Debugger-Fuel' }
+Package { #name : 'NewTools-Debugger-Fuel' }
diff --git a/src/NewTools-DebuggerSelector-Tests/DebugSessionDecoratorForTest.class.st b/src/NewTools-DebuggerSelector-Tests/DebugSessionDecoratorForTest.class.st
index 7d0055c9a..eee8c85ba 100644
--- a/src/NewTools-DebuggerSelector-Tests/DebugSessionDecoratorForTest.class.st
+++ b/src/NewTools-DebuggerSelector-Tests/DebugSessionDecoratorForTest.class.st
@@ -1,14 +1,15 @@
 Class {
-	#name : #DebugSessionDecoratorForTest,
-	#superclass : #Object,
+	#name : 'DebugSessionDecoratorForTest',
+	#superclass : 'Object',
 	#instVars : [
 		'nbOfTimesTerminateWasCalled',
 		'decoratedDebugSession'
 	],
-	#category : #'NewTools-DebuggerSelector-Tests'
+	#category : 'NewTools-DebuggerSelector-Tests',
+	#package : 'NewTools-DebuggerSelector-Tests'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 DebugSessionDecoratorForTest class >> newOn: aDebugSession [
 	| newInstance |
 	newInstance := self new.
@@ -16,29 +17,29 @@ DebugSessionDecoratorForTest class >> newOn: aDebugSession [
 	^ newInstance
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebugSessionDecoratorForTest >> decoratedDebugSession: aDebugSession [
 	decoratedDebugSession := aDebugSession
 ]
 
-{ #category : #decorator }
+{ #category : 'decorator' }
 DebugSessionDecoratorForTest >> doesNotUnderstand: aMessage [
 	aMessage lookupClass: decoratedDebugSession class.
 	^ aMessage sentTo: decoratedDebugSession
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 DebugSessionDecoratorForTest >> initialize [
 	super initialize.
 	nbOfTimesTerminateWasCalled := 0
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebugSessionDecoratorForTest >> nbOfTimesTerminateWasCalled [
 	^ nbOfTimesTerminateWasCalled
 ]
 
-{ #category : #decorator }
+{ #category : 'decorator' }
 DebugSessionDecoratorForTest >> terminate [
 	nbOfTimesTerminateWasCalled := nbOfTimesTerminateWasCalled + 1.
 	^ decoratedDebugSession terminate
diff --git a/src/NewTools-DebuggerSelector-Tests/DebugSessionStorageForTest.class.st b/src/NewTools-DebuggerSelector-Tests/DebugSessionStorageForTest.class.st
index 7b7a10db8..d784df120 100644
--- a/src/NewTools-DebuggerSelector-Tests/DebugSessionStorageForTest.class.st
+++ b/src/NewTools-DebuggerSelector-Tests/DebugSessionStorageForTest.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #DebugSessionStorageForTest,
-	#superclass : #TestCase,
+	#name : 'DebugSessionStorageForTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'debugSessionStorage',
 		'eventListener',
@@ -8,10 +8,11 @@ Class {
 		'debugSession2',
 		'debugSession3'
 	],
-	#category : #'NewTools-DebuggerSelector-Tests'
+	#category : 'NewTools-DebuggerSelector-Tests',
+	#package : 'NewTools-DebuggerSelector-Tests'
 }
 
-{ #category : #helper }
+{ #category : 'helper' }
 DebugSessionStorageForTest >> createDebugSessionForTesting [
 	| dbSession process |
 	process := [ 'hello' ] fork.
@@ -22,7 +23,7 @@ DebugSessionStorageForTest >> createDebugSessionForTesting [
 	^ dbSession
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 DebugSessionStorageForTest >> setUp [
 	"Hooks that subclasses may override to define the fixture of test."
 	super setUp.
@@ -35,7 +36,7 @@ DebugSessionStorageForTest >> setUp [
 	debugSessionStorage addSubscriberOnStorageUpdate: eventListener
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 DebugSessionStorageForTest >> testEnforceStorageLimit [
 	"Setting the storage limit to 1, and adding 3 debug sessions: 1, 2 and 3. 2 is being kept alive to simulate a debugger being open on it."
 
@@ -54,7 +55,7 @@ DebugSessionStorageForTest >> testEnforceStorageLimit [
 	self assert: (debugSessionStorage storage includes: storageUnit3)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 DebugSessionStorageForTest >> testStorageLimitForDebugSessionsNotKeptAlive [
 	"Check that the storage limit is enforced after being lowered, and that listeners do get the event that the storage limit was changed"
 
@@ -72,7 +73,7 @@ DebugSessionStorageForTest >> testStorageLimitForDebugSessionsNotKeptAlive [
 		equals: 2
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 DebugSessionStorageForTest >> testStoreDebugSession [
 	| classSetDebugSessionStorageUnitAndSubclasses |
 	self assert: debugSessionStorage storage size equals: 0.
@@ -89,7 +90,7 @@ DebugSessionStorageForTest >> testStoreDebugSession [
 		eventListener nbOfDebugSessionStorageUpdateEventReceived >= 1 "Asserts that listeners of the storageUpdate event were notified by the debugSessionStorage when a debug session was added"
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 DebugSessionStorageForTest >> testTerminate [
 	| storageUnit |
 	storageUnit := debugSessionStorage storeDebugSession: debugSession.
diff --git a/src/NewTools-DebuggerSelector-Tests/DebuggerSelectionRecordUnit.class.st b/src/NewTools-DebuggerSelector-Tests/DebuggerSelectionRecordUnit.class.st
index eac9f4226..7ae762fb5 100644
--- a/src/NewTools-DebuggerSelector-Tests/DebuggerSelectionRecordUnit.class.st
+++ b/src/NewTools-DebuggerSelector-Tests/DebuggerSelectionRecordUnit.class.st
@@ -1,14 +1,15 @@
 Class {
-	#name : #DebuggerSelectionRecordUnit,
-	#superclass : #Object,
+	#name : 'DebuggerSelectionRecordUnit',
+	#superclass : 'Object',
 	#instVars : [
 		'debuggerClass',
 		'success'
 	],
-	#category : #'NewTools-DebuggerSelector-Tests'
+	#category : 'NewTools-DebuggerSelector-Tests',
+	#package : 'NewTools-DebuggerSelector-Tests'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 DebuggerSelectionRecordUnit class >> newOnDebuggerClass: aDebuggerClass withSuccess: aBoolean [
 	| instance |
 	instance := self new.
@@ -17,22 +18,22 @@ DebuggerSelectionRecordUnit class >> newOnDebuggerClass: aDebuggerClass withSucc
 	^ instance
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelectionRecordUnit >> debuggerClass [
 	^ debuggerClass
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelectionRecordUnit >> debuggerClass: anObject [
 	debuggerClass := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelectionRecordUnit >> success [
 	^ success
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelectionRecordUnit >> success: anObject [
 	success := anObject
 ]
diff --git a/src/NewTools-DebuggerSelector-Tests/DebuggerSelectorDecoratorForTest.class.st b/src/NewTools-DebuggerSelector-Tests/DebuggerSelectorDecoratorForTest.class.st
index 5c0e41fb8..ddc4f32f1 100644
--- a/src/NewTools-DebuggerSelector-Tests/DebuggerSelectorDecoratorForTest.class.st
+++ b/src/NewTools-DebuggerSelector-Tests/DebuggerSelectorDecoratorForTest.class.st
@@ -1,14 +1,15 @@
 Class {
-	#name : #DebuggerSelectorDecoratorForTest,
-	#superclass : #Object,
+	#name : 'DebuggerSelectorDecoratorForTest',
+	#superclass : 'Object',
 	#instVars : [
 		'decoratedDebuggerSelector',
 		'debuggerSelectionAttempts'
 	],
-	#category : #'NewTools-DebuggerSelector-Tests'
+	#category : 'NewTools-DebuggerSelector-Tests',
+	#package : 'NewTools-DebuggerSelector-Tests'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 DebuggerSelectorDecoratorForTest class >> newOn: aDebuggerSelector [
 	| instance |
 	instance := self new.
@@ -16,34 +17,34 @@ DebuggerSelectorDecoratorForTest class >> newOn: aDebuggerSelector [
 	^ instance
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelectorDecoratorForTest >> debuggerSelectionAttempts [
 	^ debuggerSelectionAttempts
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelectorDecoratorForTest >> decoratedDebuggerSelector: aDebuggerSelector [
 	decoratedDebuggerSelector := aDebuggerSelector
 ]
 
-{ #category : #'reflective operations' }
+{ #category : 'reflective operations' }
 DebuggerSelectorDecoratorForTest >> doesNotUnderstand: aMessage [
 	aMessage lookupClass: decoratedDebuggerSelector class.
 	^ aMessage sentTo: decoratedDebuggerSelector
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 DebuggerSelectorDecoratorForTest >> ignoreDummyDebuggerForTests [
 	^ false
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 DebuggerSelectorDecoratorForTest >> initialize [
 	super initialize.
 	debuggerSelectionAttempts := OrderedCollection new
 ]
 
-{ #category : #helper }
+{ #category : 'helper' }
 DebuggerSelectorDecoratorForTest >> tryToOpenDebugSession: aDebugSession withDebuggerClass: aDebuggerClass withFullView: aBool andNotification: aString [
 	"Tries to open @aDebugSession with debugger @aDebuggerClass. Record this attempt in debuggerSelectionAttempts, with success = true if it succeeded, or success = false if it signaled an exception"
 
diff --git a/src/NewTools-DebuggerSelector-Tests/DebuggerSelectorForTests.class.st b/src/NewTools-DebuggerSelector-Tests/DebuggerSelectorForTests.class.st
index 927266f00..9979475d7 100644
--- a/src/NewTools-DebuggerSelector-Tests/DebuggerSelectorForTests.class.st
+++ b/src/NewTools-DebuggerSelector-Tests/DebuggerSelectorForTests.class.st
@@ -1,60 +1,61 @@
 Class {
-	#name : #DebuggerSelectorForTests,
-	#superclass : #DebuggerSelector,
+	#name : 'DebuggerSelectorForTests',
+	#superclass : 'DebuggerSelector',
 	#instVars : [
 		'debuggerSelectionAttempts',
 		'debuggerClasses'
 	],
-	#category : #'NewTools-DebuggerSelector-Tests'
+	#category : 'NewTools-DebuggerSelector-Tests',
+	#package : 'NewTools-DebuggerSelector-Tests'
 }
 
-{ #category : #helper }
+{ #category : 'helper' }
 DebuggerSelectorForTests >> clearDebuggerClasses [
 	debuggerClasses := OrderedCollection new
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelectorForTests >> debuggerClasses [
 	^ debuggerClasses
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelectorForTests >> debuggerSelectionAttempts [
 	^ debuggerSelectionAttempts
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelectorForTests >> getDebuggerClasses [
 	"The superclass' method, that looks for all debugger classes in the system, is replaced with a simple collection for testing purposes. The tests manually put test debugger classes in the collection, so that they can specify which debugger classes the debuggerSelector that is tested can work with. Otherwise, the tests of DebuggerSelector can be impacted by the presence or absence of regular debugger classes."
 
 	^ debuggerClasses
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelectorForTests >> getDebuggerClassesReal [
 	"Since #getDebuggerClasses is overriden for testing purposes in this class, we need another way to test the normal implementation of #getDebuggerClass"
 
 	^ super getDebuggerClasses
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelectorForTests >> ignoreDummyDebuggerForTests [
 	^ false
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 DebuggerSelectorForTests >> initialize [
 	super initialize.
 	debuggerSelectionAttempts := OrderedCollection new.
 	debuggerClasses := OrderedCollection new
 ]
 
-{ #category : #helper }
+{ #category : 'helper' }
 DebuggerSelectorForTests >> selectDebuggerAndOpen: a withFullView: b andNotification: c [
 	super selectDebuggerAndOpen: a withFullView: b andNotification: c
 ]
 
-{ #category : #helper }
+{ #category : 'helper' }
 DebuggerSelectorForTests >> tryToOpenDebugSession: aDebugSession withDebuggerClass: aDebuggerClass withFullView: aBool andNotification: aString [
 	"This method is the same as that of the superclass, with the difference that it logs which debuggers this class tried to open in the debuggerSelectionAttempts variable, along with whether the opening succeeded or not"
 
diff --git a/src/NewTools-DebuggerSelector-Tests/DebuggerSelectorTest.class.st b/src/NewTools-DebuggerSelector-Tests/DebuggerSelectorTest.class.st
index 346585d4a..913c0fca9 100644
--- a/src/NewTools-DebuggerSelector-Tests/DebuggerSelectorTest.class.st
+++ b/src/NewTools-DebuggerSelector-Tests/DebuggerSelectorTest.class.st
@@ -1,16 +1,17 @@
 Class {
-	#name : #DebuggerSelectorTest,
-	#superclass : #TestCase,
+	#name : 'DebuggerSelectorTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'debuggerSelector',
 		'eventListener',
 		'debugSession',
 		'testDebuggerClass'
 	],
-	#category : #'NewTools-DebuggerSelector-Tests'
+	#category : 'NewTools-DebuggerSelector-Tests',
+	#package : 'NewTools-DebuggerSelector-Tests'
 }
 
-{ #category : #helper }
+{ #category : 'helper' }
 DebuggerSelectorTest >> createDebugSessionForTesting [
 	| dbSession process |
 	process := [ 'hello' ] fork.
@@ -20,7 +21,7 @@ DebuggerSelectorTest >> createDebugSessionForTesting [
 	^ dbSession
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 DebuggerSelectorTest >> setUp [
 	"Hooks that subclasses may override to define the fixture of test."
 
@@ -40,7 +41,7 @@ DebuggerSelectorTest >> setUp [
 	testDebuggerClass := DummyDebuggerForTests
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 DebuggerSelectorTest >> testGetDebuggerClasses [
 	"Test that #getDebuggerClasses returns at least the dummy test classes"
 
@@ -56,7 +57,7 @@ DebuggerSelectorTest >> testGetDebuggerClasses [
 	self assert: (debuggerClasses includes: Object) not
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 DebuggerSelectorTest >> testIsThisClassADebugger [
 	self assert:
 		(debuggerSelector isThisClassADebugger: DummyDebuggerForTests).
@@ -65,7 +66,7 @@ DebuggerSelectorTest >> testIsThisClassADebugger [
 	self assert: (debuggerSelector isThisClassADebugger: self class) not
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 DebuggerSelectorTest >> testMainDebuggerAlgorithm [
 	"Tests that the first debugger that DebuggerSelector will try to open is the one that has been set as main debugger, even if another debugger has a higher rank"
 
@@ -83,7 +84,7 @@ DebuggerSelectorTest >> testMainDebuggerAlgorithm [
 		equals: DummyDebuggerForTests_RankZero
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 DebuggerSelectorTest >> testMainDebuggerAlgorithm_MainDebuggerCannotOpen [
 	"Tests that the first debugger that DebuggerSelector will try to open is the one that has been set as main debugger, even if another debugger has a higher rank"
 
@@ -117,7 +118,7 @@ DebuggerSelectorTest >> testMainDebuggerAlgorithm_MainDebuggerCannotOpen [
 		(debuggerSelector debuggerSelectionAttempts at: 3) success
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 DebuggerSelectorTest >> testMainDebuggerSetGet [
 	"Test that setter methods #mainDebuggerClass: and #setNoMainDebuggerClass correctly set the main debugger class. Also test that listeners to main debugger updates do get notified"
 
@@ -135,7 +136,7 @@ DebuggerSelectorTest >> testMainDebuggerSetGet [
 		equals: 2
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 DebuggerSelectorTest >> testSelectDebuggerIgnoresDebuggersSayingTheyCannotOpenTheDebugSession [
 	"Test that the debugger selection algorithm ignores debuggers that reject the debug session, and choose the next debugger that can open it instead"
 
@@ -156,7 +157,7 @@ DebuggerSelectorTest >> testSelectDebuggerIgnoresDebuggersSayingTheyCannotOpenTh
 		equals: DummyDebuggerForTests_RankZero
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 DebuggerSelectorTest >> testSettingNonDebuggerAsMainDebuggerSignalsException [
 	"Setting as main debugger a class that is not a debugger should signal a CannotSetAsMainDebuggerAClassThatIsNotADebuggerClass exception"
 
@@ -165,7 +166,7 @@ DebuggerSelectorTest >> testSettingNonDebuggerAsMainDebuggerSignalsException [
 		raise: CannotSetAsMainDebuggerAClassThatIsNotADebuggerClass
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 DebuggerSelectorTest >> testTryToOpenDebugSession [
 	"The purpose of this test is to check that the instrumentation of #tryToOpenDebugSession:withDebuggerClass:withFullView:andNotification: on DebuggerSelectorDecoratorForTest works properly"
 
diff --git a/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests.class.st b/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests.class.st
index 0040ca414..4ed777302 100644
--- a/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests.class.st
+++ b/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests.class.st
@@ -1,17 +1,18 @@
 Class {
-	#name : #DummyDebuggerForTests,
-	#superclass : #AbstractDebugger,
-	#category : #'NewTools-DebuggerSelector-Tests'
+	#name : 'DummyDebuggerForTests',
+	#superclass : 'AbstractDebugger',
+	#category : 'NewTools-DebuggerSelector-Tests',
+	#package : 'NewTools-DebuggerSelector-Tests'
 }
 
-{ #category : #'debugger declaration' }
+{ #category : 'debugger declaration' }
 DummyDebuggerForTests class >> iAmADebugger [
 	<iAmADebugger>
 	<iAmADummyDebuggerForTest>
 	
 ]
 
-{ #category : #'debugger declaration' }
+{ #category : 'debugger declaration' }
 DummyDebuggerForTests class >> openOn: aDebugSession withFullView: aBool andNotification: aString [
 	"This method will be called to open this debugger on a given debug session (i.e. execution to debug). If this debugger wants to keep the debug session (and its process) alive (for example because it is a graphical debugger that would break if the debug session is terminated while its window is open), it should call #keepAlive: on @aDebugSession, passing itself as argument.
 	The contract is that if a debugger calls #keepAlive:, it should also call #stopKeepingAlive: on @aDebugSession when it closes (passing itself as argument again).
@@ -22,7 +23,7 @@ DummyDebuggerForTests class >> openOn: aDebugSession withFullView: aBool andNoti
 	
 ]
 
-{ #category : #'debugger declaration' }
+{ #category : 'debugger declaration' }
 DummyDebuggerForTests class >> rankDebugSession: aDebugSession [
 	"Returns an integer representing how much this debugger is suitable to debug @aDebugSession. The higher the integer returned, the more suitable this debugger is. Signal the DebugSessionCannotBeOpenedByThisDebugger exception if this debugger absolutely cannot debug @aDebugSession (for example if this debugger can only handle debug sessions from test executions, and @aDebugSession does not come from a test execution)"
 
diff --git a/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests_CannotOpenDebugSession.class.st b/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests_CannotOpenDebugSession.class.st
index a0e71c011..fd70c3ec0 100644
--- a/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests_CannotOpenDebugSession.class.st
+++ b/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests_CannotOpenDebugSession.class.st
@@ -1,17 +1,18 @@
 Class {
-	#name : #'DummyDebuggerForTests_CannotOpenDebugSession',
-	#superclass : #AbstractDebugger,
-	#category : #'NewTools-DebuggerSelector-Tests'
+	#name : 'DummyDebuggerForTests_CannotOpenDebugSession',
+	#superclass : 'AbstractDebugger',
+	#category : 'NewTools-DebuggerSelector-Tests',
+	#package : 'NewTools-DebuggerSelector-Tests'
 }
 
-{ #category : #'debugger declaration' }
+{ #category : 'debugger declaration' }
 DummyDebuggerForTests_CannotOpenDebugSession class >> iAmADebugger [
 	<iAmADebugger>
 	<iAmADummyDebuggerForTest>
 	
 ]
 
-{ #category : #'debugger declaration' }
+{ #category : 'debugger declaration' }
 DummyDebuggerForTests_CannotOpenDebugSession class >> openOn: aDebugSession withFullView: aBool andNotification: aString [
 	"This method will be called to open this debugger on a given debug session (i.e. execution to debug). If this debugger wants to keep the debug session (and its process) alive (for example because it is a graphical debugger that would break if the debug session is terminated while its window is open), it should call #keepAlive: on @aDebugSession, passing itself as argument.
 	The contract is that if a debugger calls #keepAlive:, it should also call #stopKeepingAlive: on @aDebugSession when it closes (passing itself as argument again).
@@ -20,7 +21,7 @@ DummyDebuggerForTests_CannotOpenDebugSession class >> openOn: aDebugSession with
 	Error signal: 'cannot open debug session'
 ]
 
-{ #category : #'debugger declaration' }
+{ #category : 'debugger declaration' }
 DummyDebuggerForTests_CannotOpenDebugSession class >> rankDebugSession: aDebugSession [
 	"Returns an integer representing how much this debugger is suitable to debug @aDebugSession. The higher the integer returned, the more suitable this debugger is. Signal the DebugSessionCannotBeOpenedByThisDebugger exception if this debugger absolutely cannot debug @aDebugSession (for example if this debugger can only handle debug sessions from test executions, and @aDebugSession does not come from a test execution)"
 
diff --git a/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests_RankZero.class.st b/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests_RankZero.class.st
index 6ba68382d..aced402cf 100644
--- a/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests_RankZero.class.st
+++ b/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests_RankZero.class.st
@@ -1,17 +1,18 @@
 Class {
-	#name : #'DummyDebuggerForTests_RankZero',
-	#superclass : #AbstractDebugger,
-	#category : #'NewTools-DebuggerSelector-Tests'
+	#name : 'DummyDebuggerForTests_RankZero',
+	#superclass : 'AbstractDebugger',
+	#category : 'NewTools-DebuggerSelector-Tests',
+	#package : 'NewTools-DebuggerSelector-Tests'
 }
 
-{ #category : #'debugger declaration' }
+{ #category : 'debugger declaration' }
 DummyDebuggerForTests_RankZero class >> iAmADebugger [
 	<iAmADebugger>
 	<iAmADummyDebuggerForTest>
 	
 ]
 
-{ #category : #'debugger declaration' }
+{ #category : 'debugger declaration' }
 DummyDebuggerForTests_RankZero class >> openOn: aDebugSession withFullView: aBool andNotification: aString [
 	"This method will be called to open this debugger on a given debug session (i.e. execution to debug). If this debugger wants to keep the debug session (and its process) alive (for example because it is a graphical debugger that would break if the debug session is terminated while its window is open), it should call #keepAlive: on @aDebugSession, passing itself as argument.
 	The contract is that if a debugger calls #keepAlive:, it should also call #stopKeepingAlive: on @aDebugSession when it closes (passing itself as argument again).
@@ -22,7 +23,7 @@ DummyDebuggerForTests_RankZero class >> openOn: aDebugSession withFullView: aBoo
 	
 ]
 
-{ #category : #'debugger declaration' }
+{ #category : 'debugger declaration' }
 DummyDebuggerForTests_RankZero class >> rankDebugSession: aDebugSession [
 	"Returns an integer representing how much this debugger is suitable to debug @aDebugSession. The higher the integer returned, the more suitable this debugger is. Signal the DebugSessionCannotBeOpenedByThisDebugger exception if this debugger absolutely cannot debug @aDebugSession (for example if this debugger can only handle debug sessions from test executions, and @aDebugSession does not come from a test execution)"
 
diff --git a/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests_RejectAllDebugSessions.class.st b/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests_RejectAllDebugSessions.class.st
index 7bdf2597e..fbecb0191 100644
--- a/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests_RejectAllDebugSessions.class.st
+++ b/src/NewTools-DebuggerSelector-Tests/DummyDebuggerForTests_RejectAllDebugSessions.class.st
@@ -1,17 +1,18 @@
 Class {
-	#name : #'DummyDebuggerForTests_RejectAllDebugSessions',
-	#superclass : #AbstractDebugger,
-	#category : #'NewTools-DebuggerSelector-Tests'
+	#name : 'DummyDebuggerForTests_RejectAllDebugSessions',
+	#superclass : 'AbstractDebugger',
+	#category : 'NewTools-DebuggerSelector-Tests',
+	#package : 'NewTools-DebuggerSelector-Tests'
 }
 
-{ #category : #'debugger declaration' }
+{ #category : 'debugger declaration' }
 DummyDebuggerForTests_RejectAllDebugSessions class >> iAmADebugger [
 	<iAmADebugger>
 	<iAmADummyDebuggerForTest>
 	
 ]
 
-{ #category : #'debugger declaration' }
+{ #category : 'debugger declaration' }
 DummyDebuggerForTests_RejectAllDebugSessions class >> openOn: aDebugSession withFullView: aBool andNotification: aString [
 	"This method will be called to open this debugger on a given debug session (i.e. execution to debug). If this debugger wants to keep the debug session (and its process) alive (for example because it is a graphical debugger that would break if the debug session is terminated while its window is open), it should call #keepAlive: on @aDebugSession, passing itself as argument.
 	The contract is that if a debugger calls #keepAlive:, it should also call #stopKeepingAlive: on @aDebugSession when it closes (passing itself as argument again).
@@ -22,7 +23,7 @@ DummyDebuggerForTests_RejectAllDebugSessions class >> openOn: aDebugSession with
 	
 ]
 
-{ #category : #'debugger declaration' }
+{ #category : 'debugger declaration' }
 DummyDebuggerForTests_RejectAllDebugSessions class >> rankDebugSession: aDebugSession [
 	"Returns an integer representing how much this debugger is suitable to debug @aDebugSession. The higher the integer returned, the more suitable this debugger is. Signal the DebugSessionCannotBeOpenedByThisDebugger exception if this debugger absolutely cannot debug @aDebugSession (for example if this debugger can only handle debug sessions from test executions, and @aDebugSession does not come from a test execution)"
 
diff --git a/src/NewTools-DebuggerSelector-Tests/EventListenerForDebugSessionStorageTest.class.st b/src/NewTools-DebuggerSelector-Tests/EventListenerForDebugSessionStorageTest.class.st
index dd829a294..9b99a9b35 100644
--- a/src/NewTools-DebuggerSelector-Tests/EventListenerForDebugSessionStorageTest.class.st
+++ b/src/NewTools-DebuggerSelector-Tests/EventListenerForDebugSessionStorageTest.class.st
@@ -1,35 +1,36 @@
 Class {
-	#name : #EventListenerForDebugSessionStorageTest,
-	#superclass : #Object,
+	#name : 'EventListenerForDebugSessionStorageTest',
+	#superclass : 'Object',
 	#instVars : [
 		'nbOfDebugSessionStorageLimitUpdateEventReceived',
 		'nbOfDebugSessionStorageUpdateEventReceived'
 	],
-	#category : #'NewTools-DebuggerSelector-Tests'
+	#category : 'NewTools-DebuggerSelector-Tests',
+	#package : 'NewTools-DebuggerSelector-Tests'
 }
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 EventListenerForDebugSessionStorageTest >> initialize [
 	nbOfDebugSessionStorageLimitUpdateEventReceived := 0.
 	nbOfDebugSessionStorageUpdateEventReceived := 0
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 EventListenerForDebugSessionStorageTest >> nbOfDebugSessionStorageLimitUpdateEventReceived [
 	^ nbOfDebugSessionStorageLimitUpdateEventReceived
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 EventListenerForDebugSessionStorageTest >> nbOfDebugSessionStorageUpdateEventReceived [
 	^ nbOfDebugSessionStorageUpdateEventReceived
 ]
 
-{ #category : #'react to events' }
+{ #category : 'react to events' }
 EventListenerForDebugSessionStorageTest >> onDebugSessionStorageLimitUpdate [
 	nbOfDebugSessionStorageLimitUpdateEventReceived := nbOfDebugSessionStorageLimitUpdateEventReceived + 1
 ]
 
-{ #category : #'react to events' }
+{ #category : 'react to events' }
 EventListenerForDebugSessionStorageTest >> onDebugSessionStorageUpdate [
 	nbOfDebugSessionStorageUpdateEventReceived := nbOfDebugSessionStorageUpdateEventReceived
 	                                              + 1
diff --git a/src/NewTools-DebuggerSelector-Tests/EventListenerForDebuggerSelectorTest.class.st b/src/NewTools-DebuggerSelector-Tests/EventListenerForDebuggerSelectorTest.class.st
index 673acf8e5..610e47302 100644
--- a/src/NewTools-DebuggerSelector-Tests/EventListenerForDebuggerSelectorTest.class.st
+++ b/src/NewTools-DebuggerSelector-Tests/EventListenerForDebuggerSelectorTest.class.st
@@ -1,24 +1,25 @@
 Class {
-	#name : #EventListenerForDebuggerSelectorTest,
-	#superclass : #Object,
+	#name : 'EventListenerForDebuggerSelectorTest',
+	#superclass : 'Object',
 	#instVars : [
 		'nbOfMainDebuggerClassUpdateEventReceived'
 	],
-	#category : #'NewTools-DebuggerSelector-Tests'
+	#category : 'NewTools-DebuggerSelector-Tests',
+	#package : 'NewTools-DebuggerSelector-Tests'
 }
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 EventListenerForDebuggerSelectorTest >> initialize [
 	super initialize.
 	nbOfMainDebuggerClassUpdateEventReceived := 0
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 EventListenerForDebuggerSelectorTest >> nbOfMainDebuggerClassUpdateEventReceived [
 	^ nbOfMainDebuggerClassUpdateEventReceived
 ]
 
-{ #category : #'react to events' }
+{ #category : 'react to events' }
 EventListenerForDebuggerSelectorTest >> onMainDebuggerClassUpdate [
 	nbOfMainDebuggerClassUpdateEventReceived := nbOfMainDebuggerClassUpdateEventReceived + 1
 ]
diff --git a/src/NewTools-DebuggerSelector-Tests/package.st b/src/NewTools-DebuggerSelector-Tests/package.st
index cdd1001d4..76ff16536 100644
--- a/src/NewTools-DebuggerSelector-Tests/package.st
+++ b/src/NewTools-DebuggerSelector-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-DebuggerSelector-Tests' }
+Package { #name : 'NewTools-DebuggerSelector-Tests' }
diff --git a/src/NewTools-DebuggerSelector/AbstractDebugger.extension.st b/src/NewTools-DebuggerSelector/AbstractDebugger.extension.st
index 65baa6e9b..6fb7795a4 100644
--- a/src/NewTools-DebuggerSelector/AbstractDebugger.extension.st
+++ b/src/NewTools-DebuggerSelector/AbstractDebugger.extension.st
@@ -1,20 +1,20 @@
-Extension { #name : #AbstractDebugger }
+Extension { #name : 'AbstractDebugger' }
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 AbstractDebugger class >> beCurrent [
 	self isAbstract ifTrue: [ 
 		self error: 'Cannot register an abstract debugger' ].
 	DebuggerSelector singleton mainDebuggerClass: self
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 AbstractDebugger class >> iAmADebugger [
 	"Leave blank for intermediate classes. Add the <iAmADebugger> pragma for concrete debugger classes. This pragma is used by the system to find all available debuggers"
 
 	self subclassResponsibility
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 AbstractDebugger class >> rankDebugSession: aDebugSession [
 	"Returns an integer representing how much this debugger is suitable to debug @aDebugSession. The higher the integer returned, the more suitable this debugger is. Signal the DebugSessionCannotBeOpenedByThisDebugger exception if this debugger absolutely cannot debug @aDebugSession (for example if this debugger can only handle debug sessions from test executions, and @aDebugSession does not come from a test execution)"
 
diff --git a/src/NewTools-DebuggerSelector/CannotSetAsMainDebuggerAClassThatIsNotADebuggerClass.class.st b/src/NewTools-DebuggerSelector/CannotSetAsMainDebuggerAClassThatIsNotADebuggerClass.class.st
index 85d4e6c36..28ac6d226 100644
--- a/src/NewTools-DebuggerSelector/CannotSetAsMainDebuggerAClassThatIsNotADebuggerClass.class.st
+++ b/src/NewTools-DebuggerSelector/CannotSetAsMainDebuggerAClassThatIsNotADebuggerClass.class.st
@@ -1,5 +1,6 @@
 Class {
-	#name : #CannotSetAsMainDebuggerAClassThatIsNotADebuggerClass,
-	#superclass : #Error,
-	#category : #'NewTools-DebuggerSelector'
+	#name : 'CannotSetAsMainDebuggerAClassThatIsNotADebuggerClass',
+	#superclass : 'Error',
+	#category : 'NewTools-DebuggerSelector',
+	#package : 'NewTools-DebuggerSelector'
 }
diff --git a/src/NewTools-DebuggerSelector/DebugSessionCannotBeOpenedByThisDebugger.class.st b/src/NewTools-DebuggerSelector/DebugSessionCannotBeOpenedByThisDebugger.class.st
index e4c34d0a2..e2307df9d 100644
--- a/src/NewTools-DebuggerSelector/DebugSessionCannotBeOpenedByThisDebugger.class.st
+++ b/src/NewTools-DebuggerSelector/DebugSessionCannotBeOpenedByThisDebugger.class.st
@@ -1,5 +1,6 @@
 Class {
-	#name : #DebugSessionCannotBeOpenedByThisDebugger,
-	#superclass : #Error,
-	#category : #'NewTools-DebuggerSelector'
+	#name : 'DebugSessionCannotBeOpenedByThisDebugger',
+	#superclass : 'Error',
+	#category : 'NewTools-DebuggerSelector',
+	#package : 'NewTools-DebuggerSelector'
 }
diff --git a/src/NewTools-DebuggerSelector/DebugSessionStorage.class.st b/src/NewTools-DebuggerSelector/DebugSessionStorage.class.st
index 3622138f4..59bea1abc 100644
--- a/src/NewTools-DebuggerSelector/DebugSessionStorage.class.st
+++ b/src/NewTools-DebuggerSelector/DebugSessionStorage.class.st
@@ -19,8 +19,8 @@ This allows to reopen previously closed DebugSessions, and to do so with a diffe
 To maintain a DebugSession alive, a debugger has to call `#keepAlive:` on it (with itself as argument). To release the DebugSession, it has to call `#stopKeepingAlive:` (again, with itself as argument).
 "
 Class {
-	#name : #DebugSessionStorage,
-	#superclass : #Object,
+	#name : 'DebugSessionStorage',
+	#superclass : 'Object',
 	#instVars : [
 		'storage',
 		'storageLimitForDebugSessionsNotKeptAlive',
@@ -30,26 +30,27 @@ Class {
 	#classVars : [
 		'singleton'
 	],
-	#category : #'NewTools-DebuggerSelector'
+	#category : 'NewTools-DebuggerSelector',
+	#package : 'NewTools-DebuggerSelector'
 }
 
-{ #category : #singleton }
+{ #category : 'singleton' }
 DebugSessionStorage class >> singleton [
 	singleton ifNil: [ singleton := self new ].
 	^ singleton
 ]
 
-{ #category : #'publish events' }
+{ #category : 'publish events' }
 DebugSessionStorage >> addSubscriberOnStorageLimitUpdate: anObject [
 	self subscribersOnStorageLimitUpdate add: anObject
 ]
 
-{ #category : #'publish events' }
+{ #category : 'publish events' }
 DebugSessionStorage >> addSubscriberOnStorageUpdate: anObject [
 	self subscribersOnStorageUpdate add: anObject
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 DebugSessionStorage >> clear [
 	"This method should only be used for development purposes. It does not call #terminate on the stored debug sessions, and therefore does not let the debugged process be removed from the system (they will linger on)"
 
@@ -58,7 +59,7 @@ DebugSessionStorage >> clear [
 	self notifySubscribersOfAStorageUpdate
 ]
 
-{ #category : #storage }
+{ #category : 'storage' }
 DebugSessionStorage >> enforceStorageLimit [
 	"Terminate stored debug sessions until the limit (defined in the storageLimitForDebugSessionNotKeptAlive variable) is satisfied.
 	Oldest debug sessions are terminated first.
@@ -81,33 +82,33 @@ DebugSessionStorage >> enforceStorageLimit [
 	self notifySubscribersOfAStorageUpdate
 ]
 
-{ #category : #'publish events' }
+{ #category : 'publish events' }
 DebugSessionStorage >> notifySubscribersOfAStorageLimitUpdate [
 	self subscribersOnStorageLimitUpdate do: [ :subscriber_ | 
 		subscriber_ ifNotNil: [ :subscriber | 
 			subscriber onDebugSessionStorageLimitUpdate ] ]
 ]
 
-{ #category : #'publish events' }
+{ #category : 'publish events' }
 DebugSessionStorage >> notifySubscribersOfAStorageUpdate [
 	self subscribersOnStorageUpdate do: [ :subscriber_ | 
 		subscriber_ ifNotNil: [ :subscriber | 
 			subscriber onDebugSessionStorageUpdate ] ]
 ]
 
-{ #category : #'react to events' }
+{ #category : 'react to events' }
 DebugSessionStorage >> onDebugSession: aDebugSession gettingKeptAliveBy: anObject [
 	self notifySubscribersOfAStorageUpdate
 ]
 
-{ #category : #'react to events' }
+{ #category : 'react to events' }
 DebugSessionStorage >> onDebugSession: aDebugSession stoppingGettingKeptAliveBy: anObject [
 	self notifySubscribersOfAStorageUpdate.
 	aDebugSession shouldBeKeptAlive ifFalse: [ "If @aDebugSession is no longer kept alive as a result, maybe we are now breaking the storage limit rule and need to enforce it again" 
 		self enforceStorageLimit ]
 ]
 
-{ #category : #'publish events' }
+{ #category : 'publish events' }
 DebugSessionStorage >> removeSubscriberOnStorageLimitUpdate: anObject [
 	self subscribersOnStorageLimitUpdate
 		remove: anObject
@@ -115,7 +116,7 @@ DebugSessionStorage >> removeSubscriberOnStorageLimitUpdate: anObject [
 			 ]
 ]
 
-{ #category : #'publish events' }
+{ #category : 'publish events' }
 DebugSessionStorage >> removeSubscriberOnStorageUpdate: anObject [
 	self subscribersOnStorageUpdate
 		remove: anObject
@@ -123,20 +124,20 @@ DebugSessionStorage >> removeSubscriberOnStorageUpdate: anObject [
 			 ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebugSessionStorage >> storage [
 	storage ifNil: [ storage := OrderedCollection new ].
 	^ storage
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebugSessionStorage >> storageLimitForDebugSessionsNotKeptAlive [
 	storageLimitForDebugSessionsNotKeptAlive ifNil: [ 
 		storageLimitForDebugSessionsNotKeptAlive := 5 ].
 	^ storageLimitForDebugSessionsNotKeptAlive
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebugSessionStorage >> storageLimitForDebugSessionsNotKeptAlive: anInteger [
 	anInteger isInteger not | anInteger <= 0 ifTrue: [ 
 		InvalidValueForStorageLimit signal ].
@@ -145,7 +146,7 @@ DebugSessionStorage >> storageLimitForDebugSessionsNotKeptAlive: anInteger [
 	self enforceStorageLimit
 ]
 
-{ #category : #storage }
+{ #category : 'storage' }
 DebugSessionStorage >> storeDebugSession: aDebugSession [
 	| storageUnit |
 	storageUnit := DebugSessionStorageUnit newFrom: aDebugSession.
@@ -156,21 +157,21 @@ DebugSessionStorage >> storeDebugSession: aDebugSession [
 	^ storageUnit
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebugSessionStorage >> subscribersOnStorageLimitUpdate [
 	subscribersOnStorageLimitUpdate ifNil: [ 
 		subscribersOnStorageLimitUpdate := WeakOrderedCollection new ].
 	^ subscribersOnStorageLimitUpdate
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebugSessionStorage >> subscribersOnStorageUpdate [
 	subscribersOnStorageUpdate ifNil: [ 
 		subscribersOnStorageUpdate := WeakOrderedCollection new ].
 	^ subscribersOnStorageUpdate
 ]
 
-{ #category : #termination }
+{ #category : 'termination' }
 DebugSessionStorage >> terminate: aDebugSessionStorageUnit [
 	"See comment of method #_NoNotification:"
 
@@ -178,14 +179,14 @@ DebugSessionStorage >> terminate: aDebugSessionStorageUnit [
 	self notifySubscribersOfAStorageUpdate
 ]
 
-{ #category : #termination }
+{ #category : 'termination' }
 DebugSessionStorage >> terminateAll [
 	<script>
 	self storage copy do: [ :aDebugSessionStorageUnit | 
 		self terminate: aDebugSessionStorageUnit ]
 ]
 
-{ #category : #termination }
+{ #category : 'termination' }
 DebugSessionStorage >> terminate_NoNotification: aDebugSessionStorageUnit [
 	"Terminating the debug session in addition to removing it from the storage is necessary to ensure the debugged process is destroyed and does not linger in the image"
 
diff --git a/src/NewTools-DebuggerSelector/DebugSessionStorageUnit.class.st b/src/NewTools-DebuggerSelector/DebugSessionStorageUnit.class.st
index b20e15188..f97cd16f9 100644
--- a/src/NewTools-DebuggerSelector/DebugSessionStorageUnit.class.st
+++ b/src/NewTools-DebuggerSelector/DebugSessionStorageUnit.class.st
@@ -2,16 +2,17 @@
 Instances of this class are used to store debug sessions by DebugSessionStorage. Their main feature is that they also store the time at which they were created.
 "
 Class {
-	#name : #DebugSessionStorageUnit,
-	#superclass : #Object,
+	#name : 'DebugSessionStorageUnit',
+	#superclass : 'Object',
 	#instVars : [
 		'debugSession',
 		'timeOfCreation'
 	],
-	#category : #'NewTools-DebuggerSelector'
+	#category : 'NewTools-DebuggerSelector',
+	#package : 'NewTools-DebuggerSelector'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 DebugSessionStorageUnit class >> newFrom: aDebugSession [
 	^ self new
 		  debugSession: aDebugSession;
@@ -19,22 +20,22 @@ DebugSessionStorageUnit class >> newFrom: aDebugSession [
 		  yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebugSessionStorageUnit >> debugSession [
 	^ debugSession
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebugSessionStorageUnit >> debugSession: anObject [
 	debugSession := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebugSessionStorageUnit >> timeOfCreation [
 	^ timeOfCreation
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebugSessionStorageUnit >> timeOfCreation: anObject [
 	timeOfCreation := anObject
 ]
diff --git a/src/NewTools-DebuggerSelector/DebuggerListAndDebugSessionListPresenter.class.st b/src/NewTools-DebuggerSelector/DebuggerListAndDebugSessionListPresenter.class.st
index 1bcc7d514..d5c57686f 100644
--- a/src/NewTools-DebuggerSelector/DebuggerListAndDebugSessionListPresenter.class.st
+++ b/src/NewTools-DebuggerSelector/DebuggerListAndDebugSessionListPresenter.class.st
@@ -2,8 +2,8 @@
 Lists all the debuggers available in the image, along with their rank (provided they always return the same rank regardless of the debug session). Also list all the debug sessions stored in DebugSessionStorage.
 "
 Class {
-	#name : #DebuggerListAndDebugSessionListPresenter,
-	#superclass : #SpPresenter,
+	#name : 'DebuggerListAndDebugSessionListPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'debuggerList',
 		'debuggerListToolBar',
@@ -13,10 +13,11 @@ Class {
 		'storageLimitInputField',
 		'shouldUpdateStorageLimitInputField'
 	],
-	#category : #'NewTools-DebuggerSelector'
+	#category : 'NewTools-DebuggerSelector',
+	#package : 'NewTools-DebuggerSelector'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 DebuggerListAndDebugSessionListPresenter class >> defaultSpec [
 	| toolBarHeight titleHeight |
 	titleHeight := 20.
@@ -48,12 +49,12 @@ DebuggerListAndDebugSessionListPresenter class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 DebuggerListAndDebugSessionListPresenter class >> initialExtent [
 	^ 750@300
 ]
 
-{ #category : #'world menu' }
+{ #category : 'world menu' }
 DebuggerListAndDebugSessionListPresenter class >> menuCommandOn: aBuilder [
 	<worldMenu>
 	(aBuilder item: #'List Debuggers and Debug Sessions')
@@ -65,7 +66,7 @@ DebuggerListAndDebugSessionListPresenter class >> menuCommandOn: aBuilder [
 		action: [ self open ]
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 DebuggerListAndDebugSessionListPresenter class >> open [
 	<example>
 	| windowPresenter presenter |
@@ -76,12 +77,12 @@ DebuggerListAndDebugSessionListPresenter class >> open [
 	^ windowPresenter
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 DebuggerListAndDebugSessionListPresenter class >> title [
 	^ 'Debuggers and Debug Sessions'
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 DebuggerListAndDebugSessionListPresenter >> addCorrectMainDebuggerButtonToToolBar: aToolBar [
 	debuggerList selectedItems
 		ifNotEmpty: [ :debuggerList_ | 
@@ -114,7 +115,7 @@ DebuggerListAndDebugSessionListPresenter >> addCorrectMainDebuggerButtonToToolBa
 				help: 'Set this debugger to be the main debugger')
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 DebuggerListAndDebugSessionListPresenter >> compareRank: rank1 to: rank2 [
 	rank1 isInteger
 		ifFalse: [ ^ false ].	"If rank1 is not an integer, (typically a string), then it is smaller than rank2"
@@ -123,7 +124,7 @@ DebuggerListAndDebugSessionListPresenter >> compareRank: rank1 to: rank2 [
 	^ rank1 >= rank2	"Otherwise, both ranks are int, we return the result of their comparison"
 ]
 
-{ #category : #'button action' }
+{ #category : 'button action' }
 DebuggerListAndDebugSessionListPresenter >> debugDebugSessionAction [
 	"Describe the action performed by the 'Debug' button under the Debug Session List.
 	Requires a debug session to be selected in the list of debug sessions. If this condition is not met, inform the user and stop.
@@ -140,7 +141,7 @@ DebuggerListAndDebugSessionListPresenter >> debugDebugSessionAction [
 		andNotification: nil
 ]
 
-{ #category : #'button action' }
+{ #category : 'button action' }
 DebuggerListAndDebugSessionListPresenter >> debugDebugSessionWithSpecificDebuggerAction [
 	"Describe the action performed by the 'Debug With' button under the Debug Session List.
 	Requires a debug session to be selected in the list of debug sessions, and a debugger to be selected in the list of debuggers. If these conditions are not met, inform the user and stop.
@@ -162,7 +163,7 @@ DebuggerListAndDebugSessionListPresenter >> debugDebugSessionWithSpecificDebugge
 		andNotification: nil
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 DebuggerListAndDebugSessionListPresenter >> debuggerClassToNameOfDebugger: aDebuggerClass [
 	"Returns the name of @aDebuggerClass, to be displayed in the list of debuggers. If @aDebuggerClass is the main debugger defined in DebuggerSelector, return the name as a Text styled in bold"
 
@@ -173,7 +174,7 @@ DebuggerListAndDebugSessionListPresenter >> debuggerClassToNameOfDebugger: aDebu
 		ifFalse: [ ^ aDebuggerClass asString ]
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 DebuggerListAndDebugSessionListPresenter >> debuggerClassToRankToDisplay: aDebuggerClass [
 	"Returns what should be displayed as the rank of @aDebuggerClass.
 	Since we do not have a debug session to give this debugger, we try with nil. If it answers a rank, we display it, if it raises an exception, we assume it really needed a debug session to give a rank, so we display a string explaining that.
@@ -188,7 +189,7 @@ DebuggerListAndDebugSessionListPresenter >> debuggerClassToRankToDisplay: aDebug
 		ifFalse: [ ^ result ]
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 DebuggerListAndDebugSessionListPresenter >> getBlockTryingToGetRankOfDebugger [
 	"Returns a block taking a debugger as argument and returning the rank it would give to a nil debug session. If an exception is raised, the debugger really needs the debug session object to give a rank, so the block returns a string saying that. If no exception is raised, it means the debugger did not need an actual debug session object to answer, the block directly return the returned value"
 
@@ -198,7 +199,7 @@ DebuggerListAndDebugSessionListPresenter >> getBlockTryingToGetRankOfDebugger [
 		do: [ 'Depends on the debug session' ] ]
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 DebuggerListAndDebugSessionListPresenter >> getSortingBlock [
 	| rankBlock |
 	rankBlock := self getBlockTryingToGetRankOfDebugger.
@@ -209,14 +210,14 @@ DebuggerListAndDebugSessionListPresenter >> getSortingBlock [
 	self compareRank: rank1 to: rank2 ]
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 DebuggerListAndDebugSessionListPresenter >> getWhenClosedBlock [
 	"Returns the block to be executed when the windows containing this presenter is closed by the user"
 
 	^ [ self setInitialSubscriptions: false ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 DebuggerListAndDebugSessionListPresenter >> initializePresenters [
 	| timeOfStorageColumnWidth refsColumnWidth |
 	debuggerList := self newTable
@@ -280,7 +281,7 @@ DebuggerListAndDebugSessionListPresenter >> initializePresenters [
 	self setInitialSubscriptions: true
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 DebuggerListAndDebugSessionListPresenter >> makeDebugSessionListToolbar [
 	| toolBar |
 	toolBar := self newToolbar.
@@ -329,7 +330,7 @@ DebuggerListAndDebugSessionListPresenter >> makeDebugSessionListToolbar [
 	^ toolBar
 ]
 
-{ #category : #'react to events' }
+{ #category : 'react to events' }
 DebuggerListAndDebugSessionListPresenter >> onDebugSessionStorageLimitUpdate [
 	self shouldUpdateStorageLimitInputField
 		ifTrue:
@@ -339,18 +340,18 @@ DebuggerListAndDebugSessionListPresenter >> onDebugSessionStorageLimitUpdate [
 			self shouldUpdateStorageLimitInputField: true ]
 ]
 
-{ #category : #'react to events' }
+{ #category : 'react to events' }
 DebuggerListAndDebugSessionListPresenter >> onDebugSessionStorageUpdate [
 	self refreshDebugSessionList
 ]
 
-{ #category : #'react to events' }
+{ #category : 'react to events' }
 DebuggerListAndDebugSessionListPresenter >> onMainDebuggerClassUpdate [
 	self refreshDebuggerList.
 	self refreshDebuggerListToolBar
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 DebuggerListAndDebugSessionListPresenter >> printDateAndTime: aDateAndTime [
 	| d |
 	d := aDateAndTime.
@@ -359,12 +360,12 @@ DebuggerListAndDebugSessionListPresenter >> printDateAndTime: aDateAndTime [
 		, d dayOfMonth asString
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 DebuggerListAndDebugSessionListPresenter >> refreshDebugSessionList [
 	debugSessionList items: DebugSessionStorage singleton storage
 ]
 
-{ #category : #refresh }
+{ #category : 'refresh' }
 DebuggerListAndDebugSessionListPresenter >> refreshDebuggerList [
 	debuggerList
 		items:
@@ -372,7 +373,7 @@ DebuggerListAndDebugSessionListPresenter >> refreshDebuggerList [
 				sort: self getSortingBlock)
 ]
 
-{ #category : #refresh }
+{ #category : 'refresh' }
 DebuggerListAndDebugSessionListPresenter >> refreshDebuggerListToolBar [
 	debuggerListToolBar removeAllItems.
 	debuggerListToolBar
@@ -388,7 +389,7 @@ DebuggerListAndDebugSessionListPresenter >> refreshDebuggerListToolBar [
 	self addCorrectMainDebuggerButtonToToolBar: debuggerListToolBar
 ]
 
-{ #category : #announcement }
+{ #category : 'announcement' }
 DebuggerListAndDebugSessionListPresenter >> setInitialSubscriptions: aBoolean [
 	"If @aBoolean is true, perform the initial subscriptions needed to keep the UI up to date. If it is false, unsubscribe. The point of having both the subscriptions and unsubscriptions in the same method is not to forget to add unsubscription statement in the future when new subscription are added"
 
@@ -405,19 +406,19 @@ DebuggerListAndDebugSessionListPresenter >> setInitialSubscriptions: aBoolean [
 				removeSubscriberOnMainDebuggerClassUpdate: self ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerListAndDebugSessionListPresenter >> shouldUpdateStorageLimitInputField [
 	shouldUpdateStorageLimitInputField
 		ifNil: [ shouldUpdateStorageLimitInputField := true ].
 	^ shouldUpdateStorageLimitInputField
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerListAndDebugSessionListPresenter >> shouldUpdateStorageLimitInputField: aBoolean [
 	shouldUpdateStorageLimitInputField := aBoolean
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 DebuggerListAndDebugSessionListPresenter >> sortDebugSessionUnitStorage: aDebugSessionUnitStorage and: aDebugSessionUnitStorage2 [
 	"Return true if @aDebugSessionUnitStorage has been stored more recently than @aDebugSessionUnitStorage2"
 
@@ -425,7 +426,7 @@ DebuggerListAndDebugSessionListPresenter >> sortDebugSessionUnitStorage: aDebugS
 		>= aDebugSessionUnitStorage2 timeOfCreation
 ]
 
-{ #category : #help }
+{ #category : 'help' }
 DebuggerListAndDebugSessionListPresenter >> storageLimitHelp [
 	^ 'Determines the maximum number of debug sessions to be stored. Oldest debug sessions are terminated first. Debug sessions currently opened in any debugger are never terminated and do not count towards this limit'
 ]
diff --git a/src/NewTools-DebuggerSelector/DebuggerSelector.class.st b/src/NewTools-DebuggerSelector/DebuggerSelector.class.st
index d2521b25f..2c6f7b9b4 100644
--- a/src/NewTools-DebuggerSelector/DebuggerSelector.class.st
+++ b/src/NewTools-DebuggerSelector/DebuggerSelector.class.st
@@ -23,8 +23,8 @@ The algorithm outlined above gives the main idea. In addition to that:
 - `DebuggerSelector` has a `mainDebuggerClass` variable. If a debugger class is in this variable, `DebuggerSelector` will always attempt to open the DebugSession with it first, and only if that signals an Error will it fall back on the default algorithm. A use for this is to manually set a specific debugger for images in production mode, for example one that only logs the exception in a file but does not open a graphical debugger allowing the user to modify code.
 "
 Class {
-	#name : #DebuggerSelector,
-	#superclass : #Object,
+	#name : 'DebuggerSelector',
+	#superclass : 'Object',
 	#instVars : [
 		'mainDebuggerClass',
 		'subscribersOnMainDebuggerClassUpdate'
@@ -32,26 +32,27 @@ Class {
 	#classVars : [
 		'singleton'
 	],
-	#category : #'NewTools-DebuggerSelector'
+	#category : 'NewTools-DebuggerSelector',
+	#package : 'NewTools-DebuggerSelector'
 }
 
-{ #category : #singleton }
+{ #category : 'singleton' }
 DebuggerSelector class >> initialize [
 	Smalltalk tools debuggerTool: self singleton
 ]
 
-{ #category : #singleton }
+{ #category : 'singleton' }
 DebuggerSelector class >> singleton [
 	singleton ifNil: [ singleton := self new ].
 	^ singleton
 ]
 
-{ #category : #'publish events' }
+{ #category : 'publish events' }
 DebuggerSelector >> addSubscriberOnMainDebuggerClassUpdate: anObject [
 	self subscribersOnMainDebuggerClassUpdate add: anObject
 ]
 
-{ #category : #'open debugger' }
+{ #category : 'open debugger' }
 DebuggerSelector >> closeAllDebuggers [
 	self flag: 'Ugly temporary hack: Thomas can you fix this?'.
 	self flag: 'GTGenericStackDebugger is ultra slow to close its windows...'.
@@ -63,7 +64,7 @@ DebuggerSelector >> closeAllDebuggers [
 
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 DebuggerSelector >> getDebuggerClasses [
 	| result classesWithDummyDebuggerPragma |
 	result := ((PragmaCollector
@@ -81,21 +82,21 @@ DebuggerSelector >> getDebuggerClasses [
 	^ result
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelector >> ignoreDummyDebuggerForTests [
 	"If true, this class will ignore the DummyDebuggerForTests class when selecting a debugger. This is intended to be overriden for testing purposes"
 
 	^ true
 ]
 
-{ #category : #'open debugger' }
+{ #category : 'open debugger' }
 DebuggerSelector >> isObsolete [
 	"Method required for DebuggerSelector to be set as the debugger tool in 'Smalltalk tools'
 	I do not really know what it means"
 	^ false
 ]
 
-{ #category : #'open debugger' }
+{ #category : 'open debugger' }
 DebuggerSelector >> isThisClassADebugger: aClass [
 	"Returns whether @aClass implements the required methods to be considered a debugger class. It must:
 	- have a #iAmADebugger method, with the #iAmADebugger pragma
@@ -130,12 +131,12 @@ DebuggerSelector >> isThisClassADebugger: aClass [
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelector >> mainDebuggerClass [
 	^ mainDebuggerClass
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelector >> mainDebuggerClass: aClass [
 	(aClass isNil or: [ self isThisClassADebugger: aClass ])
 		ifFalse: [ CannotSetAsMainDebuggerAClassThatIsNotADebuggerClass signal ].
@@ -143,7 +144,7 @@ DebuggerSelector >> mainDebuggerClass: aClass [
 	self notifySubscribersOfAMainDebuggerClassUpdate
 ]
 
-{ #category : #'publish events' }
+{ #category : 'publish events' }
 DebuggerSelector >> notifySubscribersOfAMainDebuggerClassUpdate [
 	self subscribersOnMainDebuggerClassUpdate
 		do: [ :subscriber_ | 
@@ -151,7 +152,7 @@ DebuggerSelector >> notifySubscribersOfAMainDebuggerClassUpdate [
 				ifNotNil: [ :subscriber | subscriber onMainDebuggerClassUpdate ] ]
 ]
 
-{ #category : #'open debugger' }
+{ #category : 'open debugger' }
 DebuggerSelector >> openOn: aDebugSession withFullView: aBoolean [
 	"This method makes DebuggerSelector compatible with the rubric text editor. More specifically, the 'Debug it' option of Rubric's right-click menu will send #openOn:withFullView: to 'Smalltalk tools debugger' (see RubSmalltalkEditor>>#debug:receiver:in:. So to be able to set DebuggerSelector as the main debugger tool of 'Smalltalk tools', it needs to understand this message"
 
@@ -161,7 +162,7 @@ DebuggerSelector >> openOn: aDebugSession withFullView: aBoolean [
 		andNotification: nil
 ]
 
-{ #category : #'publish events' }
+{ #category : 'publish events' }
 DebuggerSelector >> removeSubscriberOnMainDebuggerClassUpdate: anObject [
 	self subscribersOnMainDebuggerClassUpdate
 		remove: anObject
@@ -169,7 +170,7 @@ DebuggerSelector >> removeSubscriberOnMainDebuggerClassUpdate: anObject [
 			[ "It's a weak collection, its elements can be nilled by the garbage collector at any time if they are not referenced elsewhere, so it can happen not to find the object to remove because it has already been nilled" ]
 ]
 
-{ #category : #'open debugger' }
+{ #category : 'open debugger' }
 DebuggerSelector >> selectDebuggerAndOpen: aDebugSession withFullView: aBool andNotification: aString [
 	"Open @aDebugSession with the most suitable debugger class in the system. Look at the comments below for the detailed algorithm selecting the most suitable debugger"
 
@@ -215,21 +216,21 @@ DebuggerSelector >> selectDebuggerAndOpen: aDebugSession withFullView: aBool and
 	self inform: 'No debugger could open this debug session'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 DebuggerSelector >> setNoMainDebuggerClass [
 	"Removes the main debugger class if there was any"
 
 	self mainDebuggerClass: nil
 ]
 
-{ #category : #'publish events' }
+{ #category : 'publish events' }
 DebuggerSelector >> subscribersOnMainDebuggerClassUpdate [
 	subscribersOnMainDebuggerClassUpdate
 		ifNil: [ subscribersOnMainDebuggerClassUpdate := WeakOrderedCollection new ].
 	^ subscribersOnMainDebuggerClassUpdate
 ]
 
-{ #category : #helper }
+{ #category : 'helper' }
 DebuggerSelector >> tryToOpenDebugSession: aDebugSession withDebuggerClass: aDebuggerClass withFullView: aBool andNotification: aString [
 	"Tries to open @aDebugSession with debugger @aDebuggerClass. If an Error is raised doing so, returns false, otherwise return true"
 
diff --git a/src/NewTools-DebuggerSelector/GTBytecodeDebugger.extension.st b/src/NewTools-DebuggerSelector/GTBytecodeDebugger.extension.st
index bb93b9a3d..92bed3cef 100644
--- a/src/NewTools-DebuggerSelector/GTBytecodeDebugger.extension.st
+++ b/src/NewTools-DebuggerSelector/GTBytecodeDebugger.extension.st
@@ -1,28 +1,28 @@
-Extension { #name : #GTBytecodeDebugger }
+Extension { #name : 'GTBytecodeDebugger' }
 
-{ #category : #'*NewTools-DebuggerSelector' }
-GTBytecodeDebugger class >> iAmADebugger [
+{ #category : '*NewTools-DebuggerSelector' }
+GTBytecodeDebugger classSide >> iAmADebugger [
 	"Leave blank for intermediate classes. Add the <iAmADebugger> pragma for concrete debugger classes. This pragma is used by the system to find all available debuggers"
 
 	<iAmADebugger>
 	
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
-GTBytecodeDebugger class >> openOn: aDebugSession withFullView: aBool andNotification: aString [
+{ #category : '*NewTools-DebuggerSelector' }
+GTBytecodeDebugger classSide >> openOn: aDebugSession withFullView: aBool andNotification: aString [
 	^ super
 		  openOn: (self spanNewSessionFrom: aDebugSession)
 		  withFullView: aBool
 		  andNotification: aString
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
-GTBytecodeDebugger class >> rank [
+{ #category : '*NewTools-DebuggerSelector' }
+GTBytecodeDebugger classSide >> rank [
 	^ 50
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
-GTBytecodeDebugger class >> rankDebugSession: aDebugSession [
+{ #category : '*NewTools-DebuggerSelector' }
+GTBytecodeDebugger classSide >> rankDebugSession: aDebugSession [
 	"Returns an integer representing how much this debugger is suitable to debug @aDebugSession. The higher the integer returned, the more suitable this debugger is. Signal the DebugSessionCannotBeOpenedByThisDebugger exception if this debugger absolutely cannot debug @aDebugSession (for example if this debugger can only handle debug sessions from test executions, and @aDebugSession does not come from a test execution)"
 	(self handlesContext: aDebugSession interruptedContext) ifTrue: [ ^ self rank ] ifFalse: [ DebugSessionCannotBeOpenedByThisDebugger signal ]
 ]
diff --git a/src/NewTools-DebuggerSelector/GTDebuggerSmokeTest.extension.st b/src/NewTools-DebuggerSelector/GTDebuggerSmokeTest.extension.st
index 8650a3425..5f5fdf8a0 100644
--- a/src/NewTools-DebuggerSelector/GTDebuggerSmokeTest.extension.st
+++ b/src/NewTools-DebuggerSelector/GTDebuggerSmokeTest.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #GTDebuggerSmokeTest }
+Extension { #name : 'GTDebuggerSmokeTest' }
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 GTDebuggerSmokeTest >> assertDebuggerClosing [
 	
  	debugger close.
diff --git a/src/NewTools-DebuggerSelector/GTGenericStackDebugger.extension.st b/src/NewTools-DebuggerSelector/GTGenericStackDebugger.extension.st
index b91f390d5..6e2cdf4b6 100644
--- a/src/NewTools-DebuggerSelector/GTGenericStackDebugger.extension.st
+++ b/src/NewTools-DebuggerSelector/GTGenericStackDebugger.extension.st
@@ -1,20 +1,20 @@
-Extension { #name : #GTGenericStackDebugger }
+Extension { #name : 'GTGenericStackDebugger' }
 
-{ #category : #'*NewTools-DebuggerSelector' }
-GTGenericStackDebugger class >> iAmADebugger [
+{ #category : '*NewTools-DebuggerSelector' }
+GTGenericStackDebugger classSide >> iAmADebugger [
 	"Leave blank for intermediate classes. Add the <iAmADebugger> pragma for concrete debugger classes. This pragma is used by the system to find all available debuggers"
 
 	<iAmADebugger>
 	
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
-GTGenericStackDebugger class >> rank [
+{ #category : '*NewTools-DebuggerSelector' }
+GTGenericStackDebugger classSide >> rank [
 	^ 70
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
-GTGenericStackDebugger class >> rankDebugSession: aDebugSession [
+{ #category : '*NewTools-DebuggerSelector' }
+GTGenericStackDebugger classSide >> rankDebugSession: aDebugSession [
 	"Returns an integer representing how much this debugger is suitable to debug @aDebugSession. The higher the integer returned, the more suitable this debugger is. Signal the DebugSessionCannotBeOpenedByThisDebugger exception if this debugger absolutely cannot debug @aDebugSession (for example if this debugger can only handle debug sessions from test executions, and @aDebugSession does not come from a test execution)"
 	^ self rank
 ]
diff --git a/src/NewTools-DebuggerSelector/GTMoldableDebugger.extension.st b/src/NewTools-DebuggerSelector/GTMoldableDebugger.extension.st
index 1046434b6..bd0f61685 100644
--- a/src/NewTools-DebuggerSelector/GTMoldableDebugger.extension.st
+++ b/src/NewTools-DebuggerSelector/GTMoldableDebugger.extension.st
@@ -1,14 +1,14 @@
-Extension { #name : #GTMoldableDebugger }
+Extension { #name : 'GTMoldableDebugger' }
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 GTMoldableDebugger >> actOnBrowserClosing: ann [
 	"Terminating debug sessions is now handled by DebugSessionStorage, to allow other debuggers to re-open the debug session debugged by a GTDebugger after the latter has been closed"
 	"self session ifNotNil: [ :aSession | aSession terminate ]"
 	self session ifNotNil: [ :aSession | aSession stopKeepingAlive: self ]
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
-GTMoldableDebugger class >> openOn: aDebugSession withFullView: aBool andNotification: aString [
+{ #category : '*NewTools-DebuggerSelector' }
+GTMoldableDebugger classSide >> openOn: aDebugSession withFullView: aBool andNotification: aString [
 	
 	| debugger |	
 	"debugger := (Smalltalk tools 
diff --git a/src/NewTools-DebuggerSelector/GTSUnitDebugger.extension.st b/src/NewTools-DebuggerSelector/GTSUnitDebugger.extension.st
index e95e193bc..55e905423 100644
--- a/src/NewTools-DebuggerSelector/GTSUnitDebugger.extension.st
+++ b/src/NewTools-DebuggerSelector/GTSUnitDebugger.extension.st
@@ -1,28 +1,28 @@
-Extension { #name : #GTSUnitDebugger }
+Extension { #name : 'GTSUnitDebugger' }
 
-{ #category : #'*NewTools-DebuggerSelector' }
-GTSUnitDebugger class >> iAmADebugger [
+{ #category : '*NewTools-DebuggerSelector' }
+GTSUnitDebugger classSide >> iAmADebugger [
 	"Leave blank for intermediate classes. Add the <iAmADebugger> pragma for concrete debugger classes. This pragma is used by the system to find all available debuggers"
 
 	<iAmADebugger>
 	
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
-GTSUnitDebugger class >> openOn: aDebugSession withFullView: aBool andNotification: aString [
+{ #category : '*NewTools-DebuggerSelector' }
+GTSUnitDebugger classSide >> openOn: aDebugSession withFullView: aBool andNotification: aString [
 	^ super
 		  openOn: (self spanNewSessionFrom: aDebugSession)
 		  withFullView: aBool
 		  andNotification: aString
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
-GTSUnitDebugger class >> rank [
+{ #category : '*NewTools-DebuggerSelector' }
+GTSUnitDebugger classSide >> rank [
 	^ 100
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
-GTSUnitDebugger class >> rankDebugSession: aDebugSession [
+{ #category : '*NewTools-DebuggerSelector' }
+GTSUnitDebugger classSide >> rankDebugSession: aDebugSession [
 	"Returns an integer representing how much this debugger is suitable to debug @aDebugSession. The higher the integer returned, the more suitable this debugger is. Signal the DebugSessionCannotBeOpenedByThisDebugger exception if this debugger absolutely cannot debug @aDebugSession (for example if this debugger can only handle debug sessions from test executions, and @aDebugSession does not come from a test execution)"
 	(self handlesContext: aDebugSession interruptedContext) ifTrue: [ ^ self rank ] ifFalse: [ DebugSessionCannotBeOpenedByThisDebugger signal ]
 ]
diff --git a/src/NewTools-DebuggerSelector/InformDebugger.extension.st b/src/NewTools-DebuggerSelector/InformDebugger.extension.st
index fd45bbdab..361bbbeac 100644
--- a/src/NewTools-DebuggerSelector/InformDebugger.extension.st
+++ b/src/NewTools-DebuggerSelector/InformDebugger.extension.st
@@ -1,12 +1,12 @@
-Extension { #name : #InformDebugger }
+Extension { #name : 'InformDebugger' }
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 InformDebugger class >> iAmADebugger [
 	"Leave blank for intermediate classes. Add the <iAmADebugger> pragma for concrete debugger classes. This pragma is used by the system to find all available debuggers"
 	<iAmADebugger>
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 InformDebugger class >> openOn: aDebugSession withFullView: aBool andNotification: aString [
 	"This method will be called to open this debugger on a given debug session (i.e. execution to debug). If this debugger wants to keep the debug session (and its process) alive (for example because it is a graphical debugger that would break if the debug session is terminated while its window is open), it should call #keepAlive: on @aDebugSession, passing itself as argument.
 	The contract is that if a debugger calls #keepAlive:, it should also call #stopKeepingAlive: on @aDebugSession when it closes (passing itself as argument again).
@@ -15,7 +15,7 @@ InformDebugger class >> openOn: aDebugSession withFullView: aBool andNotificatio
 	self inform: (self messageToPrintFrom: aDebugSession)
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 InformDebugger class >> rankDebugSession: aDebugSession [
 	"Returns an integer representing how much this debugger is suitable to debug @aDebugSession. The higher the integer returned, the more suitable this debugger is. Signal the DebugSessionCannotBeOpenedByThisDebugger exception if this debugger absolutely cannot debug @aDebugSession (for example if this debugger can only handle debug sessions from test executions, and @aDebugSession does not come from a test execution)"
 
diff --git a/src/NewTools-DebuggerSelector/InvalidValueForStorageLimit.class.st b/src/NewTools-DebuggerSelector/InvalidValueForStorageLimit.class.st
index a4dfc3c13..830444c5d 100644
--- a/src/NewTools-DebuggerSelector/InvalidValueForStorageLimit.class.st
+++ b/src/NewTools-DebuggerSelector/InvalidValueForStorageLimit.class.st
@@ -1,5 +1,6 @@
 Class {
-	#name : #InvalidValueForStorageLimit,
-	#superclass : #Error,
-	#category : #'NewTools-DebuggerSelector'
+	#name : 'InvalidValueForStorageLimit',
+	#superclass : 'Error',
+	#category : 'NewTools-DebuggerSelector',
+	#package : 'NewTools-DebuggerSelector'
 }
diff --git a/src/NewTools-DebuggerSelector/MorphicUIManager.extension.st b/src/NewTools-DebuggerSelector/MorphicUIManager.extension.st
index 76fa00470..8d3affe3c 100644
--- a/src/NewTools-DebuggerSelector/MorphicUIManager.extension.st
+++ b/src/NewTools-DebuggerSelector/MorphicUIManager.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #MorphicUIManager }
+Extension { #name : 'MorphicUIManager' }
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 MorphicUIManager >> debugProcess: process context: context label: title fullView: bool notification: notificationString [
 	"Open a notifier in response to an error, halt, or notify. A notifier view
 	just shows a short view of the sender stack and provides a menu that
diff --git a/src/NewTools-DebuggerSelector/NoDebugger.extension.st b/src/NewTools-DebuggerSelector/NoDebugger.extension.st
index 78dcbe5a5..a48c2dbb5 100644
--- a/src/NewTools-DebuggerSelector/NoDebugger.extension.st
+++ b/src/NewTools-DebuggerSelector/NoDebugger.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #NoDebugger }
+Extension { #name : 'NoDebugger' }
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 NoDebugger class >> iAmADebugger [
 	"Leave blank for intermediate classes. Add the <iAmADebugger> pragma for concrete debugger classes. This pragma is used by the system to find all available debuggers"
 
@@ -8,7 +8,7 @@ NoDebugger class >> iAmADebugger [
 	
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 NoDebugger class >> openOn: aDebugSession withFullView: aBool andNotification: aString [
 	"This method will be called to open this debugger on a given debug session (i.e. execution to debug). If this debugger wants to keep the debug session (and its process) alive (for example because it is a graphical debugger that would break if the debug session is terminated while its window is open), it should call #keepAlive: on @aDebugSession, passing itself as argument.
 	The contract is that if a debugger calls #keepAlive:, it should also call #stopKeepingAlive: on @aDebugSession when it closes (passing itself as argument again).
@@ -19,7 +19,7 @@ NoDebugger class >> openOn: aDebugSession withFullView: aBool andNotification: a
 	
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 NoDebugger class >> rankDebugSession: aDebugSession [
 	"Returns an integer representing how much this debugger is suitable to debug @aDebugSession. The higher the integer returned, the more suitable this debugger is. Signal the DebugSessionCannotBeOpenedByThisDebugger exception if this debugger absolutely cannot debug @aDebugSession (for example if this debugger can only handle debug sessions from test executions, and @aDebugSession does not come from a test execution)"
 
diff --git a/src/NewTools-DebuggerSelector/TranscriptDebugger.extension.st b/src/NewTools-DebuggerSelector/TranscriptDebugger.extension.st
index 6f5174b05..04aac2e8c 100644
--- a/src/NewTools-DebuggerSelector/TranscriptDebugger.extension.st
+++ b/src/NewTools-DebuggerSelector/TranscriptDebugger.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #TranscriptDebugger }
+Extension { #name : 'TranscriptDebugger' }
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 TranscriptDebugger class >> iAmADebugger [
 	"Leave blank for intermediate classes. Add the <iAmADebugger> pragma for concrete debugger classes. This pragma is used by the system to find all available debuggers"
 
@@ -8,7 +8,7 @@ TranscriptDebugger class >> iAmADebugger [
 	
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 TranscriptDebugger class >> openOn: aDebugSession withFullView: aBool andNotification: aString [
 	"This method will be called to open this debugger on a given debug session (i.e. execution to debug). If this debugger wants to keep the debug session (and its process) alive (for example because it is a graphical debugger that would break if the debug session is terminated while its window is open), it should call #keepAlive: on @aDebugSession, passing itself as argument.
 	The contract is that if a debugger calls #keepAlive:, it should also call #stopKeepingAlive: on @aDebugSession when it closes (passing itself as argument again).
@@ -17,7 +17,7 @@ TranscriptDebugger class >> openOn: aDebugSession withFullView: aBool andNotific
 	self traceCr: (self messageToPrintFrom: aDebugSession)
 ]
 
-{ #category : #'*NewTools-DebuggerSelector' }
+{ #category : '*NewTools-DebuggerSelector' }
 TranscriptDebugger class >> rankDebugSession: aDebugSession [
 	"Returns an integer representing how much this debugger is suitable to debug @aDebugSession. The higher the integer returned, the more suitable this debugger is. Signal the DebugSessionCannotBeOpenedByThisDebugger exception if this debugger absolutely cannot debug @aDebugSession (for example if this debugger can only handle debug sessions from test executions, and @aDebugSession does not come from a test execution)"
 
diff --git a/src/NewTools-DebuggerSelector/package.st b/src/NewTools-DebuggerSelector/package.st
index 4c1d37402..e68c0021a 100644
--- a/src/NewTools-DebuggerSelector/package.st
+++ b/src/NewTools-DebuggerSelector/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-DebuggerSelector' }
+Package { #name : 'NewTools-DebuggerSelector' }
diff --git a/src/NewTools-DependencyAnalyser-Tests/StDAPackageRelationGraphTest.class.st b/src/NewTools-DependencyAnalyser-Tests/StDAPackageRelationGraphTest.class.st
index ad4efa30e..b6893a7b4 100644
--- a/src/NewTools-DependencyAnalyser-Tests/StDAPackageRelationGraphTest.class.st
+++ b/src/NewTools-DependencyAnalyser-Tests/StDAPackageRelationGraphTest.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StDAPackageRelationGraphTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-DependencyAnalyser-Tests'
+	#name : 'StDAPackageRelationGraphTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-DependencyAnalyser-Tests',
+	#package : 'NewTools-DependencyAnalyser-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StDAPackageRelationGraphTest >> testBuild [
 	| graph |
 	
@@ -13,7 +14,7 @@ StDAPackageRelationGraphTest >> testBuild [
 	self denyEmpty: (graph packages select: [ :each | each packageName beginsWith: 'Spec2' ])
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StDAPackageRelationGraphTest >> testPackageAsDependentPackageWrapperOn [
 	| graph wrapped |
 
diff --git a/src/NewTools-DependencyAnalyser-Tests/StDependencyAnalyserTest.class.st b/src/NewTools-DependencyAnalyser-Tests/StDependencyAnalyserTest.class.st
index ae9087d5e..081cf6aae 100644
--- a/src/NewTools-DependencyAnalyser-Tests/StDependencyAnalyserTest.class.st
+++ b/src/NewTools-DependencyAnalyser-Tests/StDependencyAnalyserTest.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StDependencyAnalyserTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-DependencyAnalyser-Tests'
+	#name : 'StDependencyAnalyserTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-DependencyAnalyser-Tests',
+	#package : 'NewTools-DependencyAnalyser-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StDependencyAnalyserTest >> testBuildRoots [
 
 	StDANode buildForPackages: #('NewTools-DepencyAnalyser-Tests') 
diff --git a/src/NewTools-DependencyAnalyser-Tests/package.st b/src/NewTools-DependencyAnalyser-Tests/package.st
index cb1d28c39..0a4ce411c 100644
--- a/src/NewTools-DependencyAnalyser-Tests/package.st
+++ b/src/NewTools-DependencyAnalyser-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-DependencyAnalyser-Tests' }
+Package { #name : 'NewTools-DependencyAnalyser-Tests' }
diff --git a/src/NewTools-DependencyAnalyser/DAPackageDependency.extension.st b/src/NewTools-DependencyAnalyser/DAPackageDependency.extension.st
index c4fbc69d2..ea67a4d5d 100644
--- a/src/NewTools-DependencyAnalyser/DAPackageDependency.extension.st
+++ b/src/NewTools-DependencyAnalyser/DAPackageDependency.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #DAPackageDependency }
+Extension { #name : 'DAPackageDependency' }
 
-{ #category : #'*NewTools-DependencyAnalyser' }
+{ #category : '*NewTools-DependencyAnalyser' }
 DAPackageDependency >> children [
 
 	^ #()
diff --git a/src/NewTools-DependencyAnalyser/StDependencyAnalyser.class.st b/src/NewTools-DependencyAnalyser/StDependencyAnalyser.class.st
index 2e4e0a1a2..fe732c123 100644
--- a/src/NewTools-DependencyAnalyser/StDependencyAnalyser.class.st
+++ b/src/NewTools-DependencyAnalyser/StDependencyAnalyser.class.st
@@ -1,16 +1,17 @@
 Class {
-	#name : #StDependencyAnalyser,
-	#superclass : #StPresenter,
+	#name : 'StDependencyAnalyser',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'toolbarPresenter',
 		'treePresenter',
 		'filterTextPresenter',
 		'browserPresenter'
 	],
-	#category : #'NewTools-DependencyAnalyser'
+	#category : 'NewTools-DependencyAnalyser',
+	#package : 'NewTools-DependencyAnalyser'
 }
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDependencyAnalyser >> initializePresenters [
 	<script: 'self new openWithSpec'>
 	
@@ -40,7 +41,7 @@ StDependencyAnalyser >> initializePresenters [
 		yourself)
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDependencyAnalyser >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter 
@@ -48,7 +49,7 @@ StDependencyAnalyser >> initializeWindow: aWindowPresenter [
 		initialExtent: 1200@800
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDependencyAnalyser >> retrieveChildren: aNode [
 
  	^ aNode children 
@@ -61,7 +62,7 @@ StDependencyAnalyser >> retrieveChildren: aNode [
 				yourself ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDependencyAnalyser >> rootsForTest [
 
 	^ (DAPackageAnalyzerTreeModel onPackagesNamed: #('Spec2-Core')) tree roots
diff --git a/src/NewTools-DependencyAnalyser/package.st b/src/NewTools-DependencyAnalyser/package.st
index a48c0039b..973d5cb48 100644
--- a/src/NewTools-DependencyAnalyser/package.st
+++ b/src/NewTools-DependencyAnalyser/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-DependencyAnalyser' }
+Package { #name : 'NewTools-DependencyAnalyser' }
diff --git a/src/NewTools-ExternalBrowser/StExternalBrowserPresenter.class.st b/src/NewTools-ExternalBrowser/StExternalBrowserPresenter.class.st
index fd689285f..067a0735b 100644
--- a/src/NewTools-ExternalBrowser/StExternalBrowserPresenter.class.st
+++ b/src/NewTools-ExternalBrowser/StExternalBrowserPresenter.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #StExternalBrowserPresenter,
-	#superclass : #StPresenter,
+	#name : 'StExternalBrowserPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'classes',
 		'packages',
@@ -11,16 +11,17 @@ Class {
 		'model',
 		'protocol'
 	],
-	#category : #'NewTools-ExternalBrowser'
+	#category : 'NewTools-ExternalBrowser',
+	#package : 'NewTools-ExternalBrowser'
 }
 
-{ #category : #'public access' }
+{ #category : 'public access' }
 StExternalBrowserPresenter class >> browseStream: aStream [
 
 	self openOn: (RingChunkImporter fromStream: aStream)
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StExternalBrowserPresenter class >> defaultSpec [
 	<spec: #default>
 	
@@ -42,14 +43,14 @@ StExternalBrowserPresenter class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StExternalBrowserPresenter class >> example [
 	<example>
 
 	self openOn: Smalltalk image
 ]
 
-{ #category : #'System-FileRegistry' }
+{ #category : 'System-FileRegistry' }
 StExternalBrowserPresenter class >> fileReaderServicesForFile: fullName suffix: suffix [
 	<fileService>
 
@@ -58,13 +59,13 @@ StExternalBrowserPresenter class >> fileReaderServicesForFile: fullName suffix:
 		ifFalse: [ #() ]
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StExternalBrowserPresenter class >> openOn: model [
 
 	^ (self on: model) openWithSpec
 ]
 
-{ #category : #'System-FileRegistry' }
+{ #category : 'System-FileRegistry' }
 StExternalBrowserPresenter class >> serviceBrowseCode [
 	"Answer the service of opening a file-contents browser"
 
@@ -77,14 +78,14 @@ StExternalBrowserPresenter class >> serviceBrowseCode [
 		argumentGetter: [ :file| file readStream]
 ]
 
-{ #category : #'System-FileRegistry' }
+{ #category : 'System-FileRegistry' }
 StExternalBrowserPresenter class >> services [
 	"Answer potential file services associated with this class"
 
 	^ {self serviceBrowseCode}.
 ]
 
-{ #category : #'System-FileRegistry' }
+{ #category : 'System-FileRegistry' }
 StExternalBrowserPresenter class >> sourceFileSuffixes [
 
 	^#('st' 'cs')
@@ -92,13 +93,13 @@ StExternalBrowserPresenter class >> sourceFileSuffixes [
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalBrowserPresenter >> classes [
 
 	^ classes
 ]
 
-{ #category : #'structure accessing' }
+{ #category : 'structure accessing' }
 StExternalBrowserPresenter >> classesOfPackage: aPackage [
 	| theClasses |
 
@@ -109,7 +110,7 @@ StExternalBrowserPresenter >> classesOfPackage: aPackage [
 		sorted: #name ascending
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalBrowserPresenter >> connectPresenters [
 	
 	self wirePackages.
@@ -121,25 +122,25 @@ StExternalBrowserPresenter >> connectPresenters [
 		self refreshClasses: self packages selectedItem ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalBrowserPresenter >> initializeClassList [
 	classes := self newList
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalBrowserPresenter >> initializeMethodBodyPane [
 
 	method := self newCode
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalBrowserPresenter >> initializePackageList [
 	packages := self newList.
 	self populatePackages.
 	packages display: [ :m | m name ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalBrowserPresenter >> initializePresenters [
 
 	self initializePackageList.
@@ -153,20 +154,20 @@ StExternalBrowserPresenter >> initializePresenters [
 	showClassSide state: false
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalBrowserPresenter >> initializeProtocolList [
 
 	protocols := self newList
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalBrowserPresenter >> initializeSelectorList [
 
 	selectors := self newList
 	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalBrowserPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter 
@@ -174,54 +175,54 @@ StExternalBrowserPresenter >> initializeWindow: aWindowPresenter [
 		title: self title
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalBrowserPresenter >> method [
 	^ method
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalBrowserPresenter >> method: anObject [
 	method := anObject
 ]
 
-{ #category : #'structure accessing' }
+{ #category : 'structure accessing' }
 StExternalBrowserPresenter >> methodFor: aSelector [
 
 	^ (self classes selectedItem methodNamed: aSelector) sourceCode
 			
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalBrowserPresenter >> model: aModel [
 
 	model := aModel
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalBrowserPresenter >> packages [
 
 	^ packages
 ]
 
-{ #category : #'selection operation' }
+{ #category : 'selection operation' }
 StExternalBrowserPresenter >> populatePackages [
 
 	packages items: model packages.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalBrowserPresenter >> protocols [
 
 	^ protocols
 ]
 
-{ #category : #'structure accessing' }
+{ #category : 'structure accessing' }
 StExternalBrowserPresenter >> protocolsOfClass: aClass [
 
 	^ aClass protocols sorted
 ]
 
-{ #category : #refresh }
+{ #category : 'refresh' }
 StExternalBrowserPresenter >> refreshClasses: pack [
 	self resetClassSelection.
 	pack 
@@ -230,40 +231,40 @@ StExternalBrowserPresenter >> refreshClasses: pack [
 
 ]
 
-{ #category : #refresh }
+{ #category : 'refresh' }
 StExternalBrowserPresenter >> resetClassSelection [
 	
 	self classes unselectAll
 ]
 
-{ #category : #refresh }
+{ #category : 'refresh' }
 StExternalBrowserPresenter >> resetMethodBodyPane [
 	self method text: ''
 	
 ]
 
-{ #category : #refresh }
+{ #category : 'refresh' }
 StExternalBrowserPresenter >> resetProtocolSelection [
 
 	self protocols unselectAll
 ]
 
-{ #category : #refresh }
+{ #category : 'refresh' }
 StExternalBrowserPresenter >> resetSelectorSelection [
 	self selectors unselectAll
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalBrowserPresenter >> selectors [
 	^ selectors
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalBrowserPresenter >> selectors: anObject [
 	selectors := anObject
 ]
 
-{ #category : #'structure accessing' }
+{ #category : 'structure accessing' }
 StExternalBrowserPresenter >> selectorsOfProtocol: aProtocol [ 
 	| theSelectedClass |
 
@@ -275,31 +276,31 @@ StExternalBrowserPresenter >> selectorsOfProtocol: aProtocol [
 		sorted
 ]
 
-{ #category : #'accessing model' }
+{ #category : 'accessing model' }
 StExternalBrowserPresenter >> setModelBeforeInitialization: aModel [
 
 	model := aModel
 ]
 
-{ #category : #'structure accessing' }
+{ #category : 'structure accessing' }
 StExternalBrowserPresenter >> showClassDefinition [
 
 	method text:
 		(self classes selectedItem definitionString ifNil: [ '' ])
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalBrowserPresenter >> showClassSide [
 
 	^ showClassSide
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalBrowserPresenter >> title [ 
 	^ 'External Package Browser'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalBrowserPresenter >> wireClasses [
 	classes
 		whenSelectionChangedDo: [ :selection |
@@ -312,7 +313,7 @@ StExternalBrowserPresenter >> wireClasses [
 					         self showClassDefinition ] ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalBrowserPresenter >> wirePackages [
 
 	packages whenSelectionChangedDo: [ :selection | 
@@ -322,7 +323,7 @@ StExternalBrowserPresenter >> wirePackages [
 	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalBrowserPresenter >> wireProtocols [
 	protocols
 		whenSelectionChangedDo: [ :selection | 
@@ -333,7 +334,7 @@ StExternalBrowserPresenter >> wireProtocols [
 				ifNotNil: [ selectors items: (self selectorsOfProtocol: protocol) ] ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalBrowserPresenter >> wireSelectors [
 	selectors
 		whenSelectionChangedDo: [ :selection |
diff --git a/src/NewTools-ExternalBrowser/StExternalChangesBrowserPresenter.class.st b/src/NewTools-ExternalBrowser/StExternalChangesBrowserPresenter.class.st
index 08d4dc442..bc10ea70f 100644
--- a/src/NewTools-ExternalBrowser/StExternalChangesBrowserPresenter.class.st
+++ b/src/NewTools-ExternalBrowser/StExternalChangesBrowserPresenter.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #StExternalChangesBrowserPresenter,
-	#superclass : #StPresenter,
+	#name : 'StExternalChangesBrowserPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'changes',
 		'codePane',
@@ -9,17 +9,18 @@ Class {
 		'deselectAllButton',
 		'fileInSelectedButton'
 	],
-	#category : #'NewTools-ExternalBrowser'
+	#category : 'NewTools-ExternalBrowser',
+	#package : 'NewTools-ExternalBrowser'
 }
 
-{ #category : #examples }
+{ #category : 'examples' }
 StExternalChangesBrowserPresenter class >> browseRecentLog [
 	<example>
 	
 	^ self openOnStream: SourceFiles changesFileStream
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StExternalChangesBrowserPresenter class >> defaultSpec [
 	<spec: #default>
 
@@ -38,7 +39,7 @@ StExternalChangesBrowserPresenter class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StExternalChangesBrowserPresenter class >> example1 [
 	<example>
 	
@@ -46,14 +47,14 @@ StExternalChangesBrowserPresenter class >> example1 [
 
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StExternalChangesBrowserPresenter class >> example2 [
 	<example>
 	
 	self openOn: Smalltalk changesFile fullName
 ]
 
-{ #category : #'file service' }
+{ #category : 'file service' }
 StExternalChangesBrowserPresenter class >> fileReaderServicesForFile: fullName suffix: suffix [
 	<fileService>
 	| services |
@@ -66,7 +67,7 @@ StExternalChangesBrowserPresenter class >> fileReaderServicesForFile: fullName s
 	^ services
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StExternalChangesBrowserPresenter class >> openOn: changeSetName [
 
 	self new
@@ -74,7 +75,7 @@ StExternalChangesBrowserPresenter class >> openOn: changeSetName [
 		openWithSpec
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StExternalChangesBrowserPresenter class >> openOnFileName: aFileName [
 
 	self new
@@ -82,7 +83,7 @@ StExternalChangesBrowserPresenter class >> openOnFileName: aFileName [
 		openWithSpec
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StExternalChangesBrowserPresenter class >> openOnStream: aStream [
 
 	| widget |
@@ -91,13 +92,13 @@ StExternalChangesBrowserPresenter class >> openOnStream: aStream [
 	widget openWithSpec	
 ]
 
-{ #category : #'tool registry' }
+{ #category : 'tool registry' }
 StExternalChangesBrowserPresenter class >> registerToolsOn: registry [
 
 	registry register: self as: #changeList 
 ]
 
-{ #category : #'file service' }
+{ #category : 'file service' }
 StExternalChangesBrowserPresenter class >> serviceBrowseCSOrSTFile [
 	"Answer a service for opening a changelist browser on a file"
 
@@ -110,21 +111,21 @@ StExternalChangesBrowserPresenter class >> serviceBrowseCSOrSTFile [
 		argumentGetter: [ :stream | stream readStream ]
 ]
 
-{ #category : #'file service' }
+{ #category : 'file service' }
 StExternalChangesBrowserPresenter class >> services [
 	"Answer potential file services associated with this class"
 
 	^ { self serviceBrowseCSOrSTFile }
 ]
 
-{ #category : #icons }
+{ #category : 'icons' }
 StExternalChangesBrowserPresenter class >> taskbarIconName [
 	"Answer the icon for the receiver in a task bar."
 
 	^#smallSaveIcon
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalChangesBrowserPresenter >> buildMenu [
 
 	^ self newMenu 
@@ -136,7 +137,7 @@ StExternalChangesBrowserPresenter >> buildMenu [
 			action: [ self compareToCurrent: changes selectedItem ] ]
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 StExternalChangesBrowserPresenter >> canCompareToCurrent [
 
 	| aMethodDeclaration |
@@ -148,13 +149,13 @@ StExternalChangesBrowserPresenter >> canCompareToCurrent [
 	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalChangesBrowserPresenter >> changeDescription: change [
 
 	^ change description
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalChangesBrowserPresenter >> changeSetName: aFileName [
 
 	changeSet := CodeImporter fileNamed: aFileName.
@@ -162,19 +163,19 @@ StExternalChangesBrowserPresenter >> changeSetName: aFileName [
 	changes items: changeSet codeDeclarations.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalChangesBrowserPresenter >> changes [
 
 	^ changes
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalChangesBrowserPresenter >> codePane [
 
 	^ codePane
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 StExternalChangesBrowserPresenter >> compareToCurrent: aMethodDeclaration [
 
 	| class sourceString |
@@ -189,7 +190,7 @@ StExternalChangesBrowserPresenter >> compareToCurrent: aMethodDeclaration [
 		inWindowLabeled: 'Comparison to Current Version'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalChangesBrowserPresenter >> connectPresenters [
 
 	super connectPresenters.
@@ -203,31 +204,31 @@ StExternalChangesBrowserPresenter >> connectPresenters [
 	fileInSelectedButton action: [ self fileIn: changes selectedItemsSorted ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalChangesBrowserPresenter >> deselectAllButton [
 
 	^ deselectAllButton
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 StExternalChangesBrowserPresenter >> fileIn: aCodeDeclaration [
 
 	aCodeDeclaration do: [:each | each import]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalChangesBrowserPresenter >> fileInSelectedButton [
 
 	^ fileInSelectedButton
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalChangesBrowserPresenter >> initialExtent [
 
 	^ 500@900
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalChangesBrowserPresenter >> initializePresenters [
 
 	
@@ -248,7 +249,7 @@ StExternalChangesBrowserPresenter >> initializePresenters [
 	codePane := self newCode
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StExternalChangesBrowserPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter 
@@ -256,7 +257,7 @@ StExternalChangesBrowserPresenter >> initializeWindow: aWindowPresenter [
 		title: 'Change Browser'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StExternalChangesBrowserPresenter >> selectAllButton [
 
 	^ selectAllButton
diff --git a/src/NewTools-ExternalBrowser/package.st b/src/NewTools-ExternalBrowser/package.st
index 0ce25a61d..4cfb30cea 100644
--- a/src/NewTools-ExternalBrowser/package.st
+++ b/src/NewTools-ExternalBrowser/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-ExternalBrowser' }
+Package { #name : 'NewTools-ExternalBrowser' }
diff --git a/src/NewTools-FileBrowser-Tests/StFBAbstractFilterTest.class.st b/src/NewTools-FileBrowser-Tests/StFBAbstractFilterTest.class.st
index 62adb6040..eb2756ad8 100644
--- a/src/NewTools-FileBrowser-Tests/StFBAbstractFilterTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBAbstractFilterTest.class.st
@@ -2,76 +2,78 @@
 A FDAbstractFilterTest is a test class for testing the behavior of FDAbstractFilter
 "
 Class {
-	#name : #StFBAbstractFilterTest,
-	#superclass : #StFBTestCase,
+	#name : 'StFBAbstractFilterTest',
+	#superclass : 'StFBTestCase',
 	#instVars : [
 		'filter'
 	],
-	#category : #'NewTools-FileBrowser-Tests-Filtering'
+	#category : 'NewTools-FileBrowser-Tests-Filtering',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'Filtering'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBAbstractFilterTest class >> isAbstract [
 	^ self = StFBAbstractFilterTest
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractFilterTest >> actualClass [
 	^ self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractFilterTest >> bananaJpg [
 	^ root / 'banana.jpg'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractFilterTest >> dir [
 	^ root / 'dir'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractFilterTest >> dirExt [
 	^ root / 'dir.ext'
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StFBAbstractFilterTest >> fileNamed: aString [
 	^ FileSystem memory / aString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractFilterTest >> hidden [
 	^ root / '.hidden'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractFilterTest >> hiddenDir [
 	^ root / '.hidden-dir'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractFilterTest >> patatePng [
 	^ root / 'patate.png'
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StFBAbstractFilterTest >> setUp [
 	super setUp.
 	filter := self actualClass new
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractFilterTest >> sthAaa [
 	^ root / 'sth.aaa'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractFilterTest >> sthExt [
 	^ root / 'sth.ext'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBAbstractFilterTest >> testPredicate [
 	self subclassResponsibility
 ]
diff --git a/src/NewTools-FileBrowser-Tests/StFBBitmapFilterTest.class.st b/src/NewTools-FileBrowser-Tests/StFBBitmapFilterTest.class.st
index 90d7d8635..4c325285d 100644
--- a/src/NewTools-FileBrowser-Tests/StFBBitmapFilterTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBBitmapFilterTest.class.st
@@ -2,17 +2,19 @@
 A FDBitmapFilterTest is a test class for testing the behavior of FDBitmapFilter
 "
 Class {
-	#name : #StFBBitmapFilterTest,
-	#superclass : #StFBExtensionsFilterTest,
-	#category : #'NewTools-FileBrowser-Tests-Filtering'
+	#name : 'StFBBitmapFilterTest',
+	#superclass : 'StFBExtensionsFilterTest',
+	#category : 'NewTools-FileBrowser-Tests-Filtering',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBBitmapFilterTest >> actualClass [
 	^ StFBBitmapFilter
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBBitmapFilterTest >> testPredicate [
 	self assert: (filter predicate: (self fileNamed: 'bitmap.bmp')).
 	self assert: (filter predicate: (self fileNamed: 'bitmap.dib')).
diff --git a/src/NewTools-FileBrowser-Tests/StFBDirectoryFilterTest.class.st b/src/NewTools-FileBrowser-Tests/StFBDirectoryFilterTest.class.st
index e5fa50350..9650f7c59 100644
--- a/src/NewTools-FileBrowser-Tests/StFBDirectoryFilterTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBDirectoryFilterTest.class.st
@@ -2,17 +2,19 @@
 A FDDirectoryFilterTest is a test class for testing the behavior of FDDirectoryFilter
 "
 Class {
-	#name : #StFBDirectoryFilterTest,
-	#superclass : #StFBAbstractFilterTest,
-	#category : #'NewTools-FileBrowser-Tests-Filtering'
+	#name : 'StFBDirectoryFilterTest',
+	#superclass : 'StFBAbstractFilterTest',
+	#category : 'NewTools-FileBrowser-Tests-Filtering',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBDirectoryFilterTest >> actualClass [
 	^ StFBDirectoryFilter
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBDirectoryFilterTest >> testPredicate [
 	self assertCollection: (filter applyOn: root children) hasSameElements: {self dir . self dirExt . self hiddenDir}
 ]
diff --git a/src/NewTools-FileBrowser-Tests/StFBExtensionsFilterTest.class.st b/src/NewTools-FileBrowser-Tests/StFBExtensionsFilterTest.class.st
index 954b0107e..7f2743d78 100644
--- a/src/NewTools-FileBrowser-Tests/StFBExtensionsFilterTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBExtensionsFilterTest.class.st
@@ -2,12 +2,14 @@
 A FDExtensionsFilterTest is a test class for testing the behavior of FDExtensionsFilter
 "
 Class {
-	#name : #StFBExtensionsFilterTest,
-	#superclass : #StFBAbstractFilterTest,
-	#category : #'NewTools-FileBrowser-Tests-Filtering'
+	#name : 'StFBExtensionsFilterTest',
+	#superclass : 'StFBAbstractFilterTest',
+	#category : 'NewTools-FileBrowser-Tests-Filtering',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'Filtering'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBExtensionsFilterTest class >> isAbstract [
 	^ self = StFBExtensionsFilterTest
 ]
diff --git a/src/NewTools-FileBrowser-Tests/StFBFileDialogTest.class.st b/src/NewTools-FileBrowser-Tests/StFBFileDialogTest.class.st
index 49e4fa613..d91942fcc 100644
--- a/src/NewTools-FileBrowser-Tests/StFBFileDialogTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBFileDialogTest.class.st
@@ -1,24 +1,26 @@
 Class {
-	#name : #StFBFileDialogTest,
-	#superclass : #StFBTestCase,
+	#name : 'StFBFileDialogTest',
+	#superclass : 'StFBTestCase',
 	#instVars : [
 		'dialog',
 		'window'
 	],
-	#category : #'NewTools-FileBrowser-Tests-UI'
+	#category : 'NewTools-FileBrowser-Tests-UI',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'UI'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBFileDialogTest class >> isAbstract [
 	^ self = StFBFileDialogTest
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogTest >> dialogClass [
 	^ self subclassResponsibility
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileDialogTest >> fileListAllMustBeFilterByPNGFIlter [
 	self
 		assert:
@@ -28,32 +30,32 @@ StFBFileDialogTest >> fileListAllMustBeFilterByPNGFIlter [
 						or: [ fileReference basename endsWith: '.png' ] ])
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StFBFileDialogTest >> setUp [
 	super setUp.
 	(dialog := self dialogClass new) defaultFolder: root
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StFBFileDialogTest >> tearDown [
 	dialog class initialize.
 	window ifNotNil: #delete.
 	super tearDown
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileDialogTest >> testIsRootDirectory [
 	self assert: (dialog isRootDirectory: FileLocator root)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileDialogTest >> testIsRootDirectoryWindowsDrive [
 	OSPlatform current isWindows
 		ifFalse: [ ^ self ].
 	self assert: (dialog isRootDirectory: FileLocator C)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileDialogTest >> testOpen [
 
 	"will it even open?"
@@ -61,7 +63,7 @@ StFBFileDialogTest >> testOpen [
 	window := dialog openDialog
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileDialogTest >> testOpenFolder [
 	window := dialog open.
 	self assert: dialog currentDirectory equals: root.
@@ -69,7 +71,7 @@ StFBFileDialogTest >> testOpenFolder [
 	self assert: dialog currentDirectory equals: root / 'dir'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileDialogTest >> testWhenAddACollectionOfBookmarkToCustomBookmarkShouldBeAddedToBookmarkTreeTable [
 	| aCollectionOfBookmark |
 	aCollectionOfBookmark := {(root / 'dir') asFileReference.
@@ -88,7 +90,7 @@ StFBFileDialogTest >> testWhenAddACollectionOfBookmarkToCustomBookmarkShouldBeAd
 	self assert: dialog bookmarksTreeTable roots size equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileDialogTest >> testWhenAddingBookmarkOnDefaultBookmarksShouldBeAddToAllInstance [
 	| anOtherInstance addCommand |
 	anOtherInstance := StFBOpenDirectoryDialog new.
@@ -108,7 +110,7 @@ StFBFileDialogTest >> testWhenAddingBookmarkOnDefaultBookmarksShouldBeAddToAllIn
 		hasSameElements: anOtherInstance bookmarksTreeTable roots
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileDialogTest >> testWhenAddingBookmarkOnIsolateBookmarksShouldBeAddToAllInstance [
 	| anOtherInstance addCommand |
 	dialog isolate.
@@ -125,7 +127,7 @@ StFBFileDialogTest >> testWhenAddingBookmarkOnIsolateBookmarksShouldBeAddToAllIn
 		equals: anOtherInstance bookmarksTreeTable roots
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileDialogTest >> testWhenChangeDirectoryShouldFilesListContainsHisChildren [
 	| newDirectory |
 	newDirectory := (root / 'dir') asFileReference.
diff --git a/src/NewTools-FileBrowser-Tests/StFBFileFilterTest.class.st b/src/NewTools-FileBrowser-Tests/StFBFileFilterTest.class.st
index cb4ab039e..3b038ce47 100644
--- a/src/NewTools-FileBrowser-Tests/StFBFileFilterTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBFileFilterTest.class.st
@@ -1,15 +1,17 @@
 Class {
-	#name : #StFBFileFilterTest,
-	#superclass : #StFBAbstractFilterTest,
-	#category : #'NewTools-FileBrowser-Tests-UI'
+	#name : 'StFBFileFilterTest',
+	#superclass : 'StFBAbstractFilterTest',
+	#category : 'NewTools-FileBrowser-Tests-UI',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'UI'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileFilterTest >> actualClass [
 	^ StFBFileFilter
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileFilterTest >> testFilterExtensions [
 	self
 		assert: ((filter files: root children withExtensions: #(aaa)) collect: #basename) asSet
@@ -21,7 +23,7 @@ StFBFileFilterTest >> testFilterExtensions [
 				with: 'sth.aaa')
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileFilterTest >> testFilterMatching [
 	self
 		assert: ((filter files: root children matching: #('*th.e*' '*dd*')) collect: #basename) asSet
@@ -34,14 +36,14 @@ StFBFileFilterTest >> testFilterMatching [
 				with: 'sth.ext')
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileFilterTest >> testFoldersOnly [
 	self
 		assert: ((filter directoriesOnly: root children) collect: #basename) asSet
 		equals: (Set with: 'dir' with: 'dir.ext' with: '.hidden-dir')
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileFilterTest >> testHiddenFiles [
 
 	self
@@ -56,7 +58,7 @@ StFBFileFilterTest >> testHiddenFiles [
 				 with: 'patate.png')
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBFileFilterTest >> testPredicate [
 	self assertCollection: (filter applyOn: root children) hasSameElements: (root children select: #isFile)
 ]
diff --git a/src/NewTools-FileBrowser-Tests/StFBFileSystemResource.class.st b/src/NewTools-FileBrowser-Tests/StFBFileSystemResource.class.st
index 7e34e97c7..ac954b07d 100644
--- a/src/NewTools-FileBrowser-Tests/StFBFileSystemResource.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBFileSystemResource.class.st
@@ -1,30 +1,32 @@
 Class {
-	#name : #StFBFileSystemResource,
-	#superclass : #TestResource,
+	#name : 'StFBFileSystemResource',
+	#superclass : 'TestResource',
 	#instVars : [
 		'root'
 	],
-	#category : #'NewTools-FileBrowser-Tests-Utils'
+	#category : 'NewTools-FileBrowser-Tests-Utils',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'Utils'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileSystemResource >> bananaJpg [
 
 	^ '/9j/4AAQSkZJRgABAQEAYABgAAD/4QBaRXhpZgAATU0AKgAAAAgABQMBAAUAAAABAAAASgMDAAEAAAABAAAAAFEQAAEAAAABAQAAAFERAAQAAAABAAAOw1ESAAQAAAABAAAOwwAAAAAAAYagAACxj//bAEMAAgEBAgEBAgICAgICAgIDBQMDAwMDBgQEAwUHBgcHBwYHBwgJCwkICAoIBwcKDQoKCwwMDAwHCQ4PDQwOCwwMDP/bAEMBAgICAwMDBgMDBgwIBwgMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIABAAEAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP38rmfGGs3MvirRNKsLya0nkuFurkxhCJIFDExNvRuHwfu4YbR8wzmofEVj4m0u7uZdJnS+t7jO2GYqHt2PdScAgdsnvjHGaTwN4EutP1ebV9Xljn1KcEKF5EQIGecdeMccAZ5OePx3OOLM/wAxzGjkOV4CvQftYutXnGKpxowleXs6iclOVVR5UkrxUm5KLWnq0cPRpwdepOMtHZdbtdV5fof/2Q=='
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileSystemResource >> patatePng [
 
 	^ 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAECSURBVDhPY/z//z8DKYAJShMNaK8Bnx927fVkY+WXFHZU106HCuHScHhP4r9/v998PaUgEfLl80MJaTu4HixOAqv++fbbOWZGTqBqoMiLp4cgUkCArgGs+tfbbxdYmDgEuXSAIowMjExMLBBZIEDR8OfPN7Dq83/+ffv55yMHpyhQ8D/DfyYmNogCIIBr+AvEF0+3gFj/vjL8/y/GY8HCwgWWYrB2mg1hAAFcAzMQA1387vtFYCgwMoLcAPEAXBsEYHr6HxDLifoyMoKkgKqRjQcCJA3/PwKlhTgNgUwg4///f8zMHNZOUyCScIAeD0f3pb74eFCC3x7NYDigdWplYAAAtuxmjgEpJ3EAAAAASUVORK5CYII='
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileSystemResource >> root [
 	^ root
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StFBFileSystemResource >> setUp [
 
 	super setUp.
@@ -52,7 +54,7 @@ StFBFileSystemResource >> setUp [
 		root / 'patate.png'
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StFBFileSystemResource >> tearDown [
 	root ensureDeleteAll.
 	super tearDown
diff --git a/src/NewTools-FileBrowser-Tests/StFBGIFFilterTest.class.st b/src/NewTools-FileBrowser-Tests/StFBGIFFilterTest.class.st
index 3b4ea2d14..91d594afe 100644
--- a/src/NewTools-FileBrowser-Tests/StFBGIFFilterTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBGIFFilterTest.class.st
@@ -2,17 +2,19 @@
 A FDGIFFilterTest is a test class for testing the behavior of FDGIFFilter
 "
 Class {
-	#name : #StFBGIFFilterTest,
-	#superclass : #StFBExtensionsFilterTest,
-	#category : #'NewTools-FileBrowser-Tests-Filtering'
+	#name : 'StFBGIFFilterTest',
+	#superclass : 'StFBExtensionsFilterTest',
+	#category : 'NewTools-FileBrowser-Tests-Filtering',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBGIFFilterTest >> actualClass [
 	^ StFBGIFFilter
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBGIFFilterTest >> testPredicate [
 	self assert: (filter predicate: (self fileNamed: 'gif.gif')).
 	self deny: (filter predicate: (self fileNamed: 'bitmap.png'))
diff --git a/src/NewTools-FileBrowser-Tests/StFBJPEGFilterTest.class.st b/src/NewTools-FileBrowser-Tests/StFBJPEGFilterTest.class.st
index 9be3b946b..fb843e399 100644
--- a/src/NewTools-FileBrowser-Tests/StFBJPEGFilterTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBJPEGFilterTest.class.st
@@ -2,17 +2,19 @@
 A FDJPEGFilterTest is a test class for testing the behavior of FDJPEGFilter
 "
 Class {
-	#name : #StFBJPEGFilterTest,
-	#superclass : #StFBExtensionsFilterTest,
-	#category : #'NewTools-FileBrowser-Tests-Filtering'
+	#name : 'StFBJPEGFilterTest',
+	#superclass : 'StFBExtensionsFilterTest',
+	#category : 'NewTools-FileBrowser-Tests-Filtering',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBJPEGFilterTest >> actualClass [
 	^ StFBJPEGFilter
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBJPEGFilterTest >> testPredicate [
 	self assert: (filter predicate: (self fileNamed: 'image.jpeg')).
 	self assert: (filter predicate: (self fileNamed: 'image.jpg')).
diff --git a/src/NewTools-FileBrowser-Tests/StFBNavigationSystemTest.class.st b/src/NewTools-FileBrowser-Tests/StFBNavigationSystemTest.class.st
index 303030b46..0aaa9b9ff 100644
--- a/src/NewTools-FileBrowser-Tests/StFBNavigationSystemTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBNavigationSystemTest.class.st
@@ -1,13 +1,15 @@
 Class {
-	#name : #StFBNavigationSystemTest,
-	#superclass : #StFBTestCase,
+	#name : 'StFBNavigationSystemTest',
+	#superclass : 'StFBTestCase',
 	#instVars : [
 		'dialog'
 	],
-	#category : #'NewTools-FileBrowser-Tests-UI'
+	#category : 'NewTools-FileBrowser-Tests-UI',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'UI'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> fileListAllMustBeFilterByPNGFIlter [
 	self
 		assert:
@@ -17,14 +19,14 @@ StFBNavigationSystemTest >> fileListAllMustBeFilterByPNGFIlter [
 						or: [ fileReference basename endsWith: '.png' ] ])
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StFBNavigationSystemTest >> setUp [
 	super setUp.
 	dialog := StFBFileNavigationSystemPresenter new.
 	dialog defaultFolder: root
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testCustomizationWhenChangeCollectionOfPreviewerShouldBeSet [
 	| previewerUtil |
 	previewerUtil := StFBPNGPreviewer new.
@@ -32,17 +34,17 @@ StFBNavigationSystemTest >> testCustomizationWhenChangeCollectionOfPreviewerShou
 	self assert: dialog previewer equals: previewerUtil
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testInitializeCurrentPathTextInputShouldSet [
 	self assert: dialog currentDirectory fullName equals: dialog currentPathTextInputPresenter entityText text 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testInitializeFilterDropListSelectedItemShouldBeDefaultFilter [
 	self assert: dialog filtersDropList selectedItem name equals: StFBVisibleFilter new name
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testInitializeShouldOnlySeeNotHiddenFile [
 
 	Smalltalk os isWindows ifTrue: [ 
@@ -56,14 +58,14 @@ StFBNavigationSystemTest >> testInitializeShouldOnlySeeNotHiddenFile [
 				asOrderedCollection
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testOpenFolder [
 	self assert: dialog currentDirectory equals: root.
 	dialog openFolder: root / 'dir'.
 	self assert: dialog currentDirectory equals: root / 'dir'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testWhenClickAnAfterHistoryButtonIfThereAreHistoryShouldComeBackTheGoodDirectory [
 	| itemsBefore |
 	itemsBefore := dialog fileReferenceTable items.
@@ -76,7 +78,7 @@ StFBNavigationSystemTest >> testWhenClickAnAfterHistoryButtonIfThereAreHistorySh
 	self assertCollection: (dialog fileReferenceTable items collect: #basename) hasSameElements: {'klm.jpg' . 'klm.png'}
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testWhenClickAnBeforeHistoryButtonIfThereAreHistoryShouldComeBackToTheLastDirectoryVisited [
 	| itemsBefore |
 	itemsBefore := dialog fileReferenceTable items.
@@ -87,7 +89,7 @@ StFBNavigationSystemTest >> testWhenClickAnBeforeHistoryButtonIfThereAreHistoryS
 	self assertCollection: dialog fileReferenceTable items hasSameElements: itemsBefore
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testWhenCurrentDirectoryChangeshouldNewFileDialogOpenOnTheNewDirectory [
 	| dirIndex newFileDialog |
 	dirIndex := (dialog fileReferenceTable items collect: #basename) indexOf: 'dir'.
@@ -97,7 +99,7 @@ StFBNavigationSystemTest >> testWhenCurrentDirectoryChangeshouldNewFileDialogOpe
 	self assert: newFileDialog currentDirectory equals: (root / 'dir') asFileReference
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testWhenCustomizeFilterShouldFilterDropListPresenterIncludeIt [
 	| aCollectionOfFilter |
 	aCollectionOfFilter := {StFBAllFilter new . StFBJPEGFilter new}.
@@ -106,7 +108,7 @@ StFBNavigationSystemTest >> testWhenCustomizeFilterShouldFilterDropListPresenter
 	self assert: (dialog filtersDropList listItems includesAll: aCollectionOfFilter)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testWhenCustomizeFilterWithoutDefaultFilterShouldFilterDropListPresenterIncludeDefaultFilterAndSelectIt [
 	| aCollectionOfFilter |
 	aCollectionOfFilter := {StFBJPEGFilter new}.
@@ -115,7 +117,7 @@ StFBNavigationSystemTest >> testWhenCustomizeFilterWithoutDefaultFilterShouldFil
 	self assert: (dialog filtersDropList listItems includesAll: aCollectionOfFilter)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testWhenFilesListSelectionChangedAndIsAJPGShouldpreviewContentPresenterIsNotNil [
 
 	| previewerUtil |
@@ -128,7 +130,7 @@ StFBNavigationSystemTest >> testWhenFilesListSelectionChangedAndIsAJPGShouldprev
 	self assert: dialog selectedEntry basename equals: 'banana.jpg'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testWhenOpenADirectoryShouldDisplayHisChildrenFilterByCurrentFilter [
 	dialog filtersDropList selectIndex: ((dialog filtersDropList listItems collect: #name) indexOf: StFBPNGFilter new name).
 	self fileListAllMustBeFilterByPNGFIlter.
@@ -138,7 +140,7 @@ StFBNavigationSystemTest >> testWhenOpenADirectoryShouldDisplayHisChildrenFilter
 	self fileListAllMustBeFilterByPNGFIlter
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNavigationSystemTest >> testWhenPathTextInputPresenterAcceptShouldChangeFileListWithTheGoodContent [
 
 	dialog currentPathTextInputPresenter pathTextChangedTo:
diff --git a/src/NewTools-FileBrowser-Tests/StFBNilFilterTest.class.st b/src/NewTools-FileBrowser-Tests/StFBNilFilterTest.class.st
index efe77c37b..3f5ca9e27 100644
--- a/src/NewTools-FileBrowser-Tests/StFBNilFilterTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBNilFilterTest.class.st
@@ -2,17 +2,19 @@
 A FDNilFilterTest is a test class for testing the behavior of FDNilFilter
 "
 Class {
-	#name : #StFBNilFilterTest,
-	#superclass : #StFBAbstractFilterTest,
-	#category : #'NewTools-FileBrowser-Tests-Filtering'
+	#name : 'StFBNilFilterTest',
+	#superclass : 'StFBAbstractFilterTest',
+	#category : 'NewTools-FileBrowser-Tests-Filtering',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBNilFilterTest >> actualClass [
 	^ StFBAllFilter
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBNilFilterTest >> testPredicate [
 	self assertCollection: (filter applyOn: root children) hasSameElements: root children
 ]
diff --git a/src/NewTools-FileBrowser-Tests/StFBOpenDirectoryDialogTest.class.st b/src/NewTools-FileBrowser-Tests/StFBOpenDirectoryDialogTest.class.st
index 076d3b5ff..fd64cdc73 100644
--- a/src/NewTools-FileBrowser-Tests/StFBOpenDirectoryDialogTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBOpenDirectoryDialogTest.class.st
@@ -1,22 +1,24 @@
 Class {
-	#name : #StFBOpenDirectoryDialogTest,
-	#superclass : #StFBFileDialogTest,
-	#category : #'NewTools-FileBrowser-Tests-UI'
+	#name : 'StFBOpenDirectoryDialogTest',
+	#superclass : 'StFBFileDialogTest',
+	#category : 'NewTools-FileBrowser-Tests-UI',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'UI'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBOpenDirectoryDialogTest >> dialogClass [
 	^ StFBOpenDirectoryDialog
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBOpenDirectoryDialogTest >> testDefaultDirectory [
 	self assert: dialog selectedEntry equals: root.
 	dialog defaultFolder: root / 'dir'.
 	self assert: dialog selectedEntry equals: root / 'dir'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBOpenDirectoryDialogTest >> testSelectDirectory [
 
 	| selectedDirectory |
@@ -33,7 +35,7 @@ StFBOpenDirectoryDialogTest >> testSelectDirectory [
 	self assert: selectedDirectory equals: root / 'dir'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBOpenDirectoryDialogTest >> testSelectNonexistingDirectory [
 
 	self
diff --git a/src/NewTools-FileBrowser-Tests/StFBOpenFileDialogTest.class.st b/src/NewTools-FileBrowser-Tests/StFBOpenFileDialogTest.class.st
index f63149244..657fbb607 100644
--- a/src/NewTools-FileBrowser-Tests/StFBOpenFileDialogTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBOpenFileDialogTest.class.st
@@ -1,15 +1,17 @@
 Class {
-	#name : #StFBOpenFileDialogTest,
-	#superclass : #StFBFileDialogTest,
-	#category : #'NewTools-FileBrowser-Tests-UI'
+	#name : 'StFBOpenFileDialogTest',
+	#superclass : 'StFBFileDialogTest',
+	#category : 'NewTools-FileBrowser-Tests-UI',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'UI'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBOpenFileDialogTest >> dialogClass [
 	^ StFBOpenFileDialog
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBOpenFileDialogTest >> testExtensions [
 
 	dialog extensions: #( ext ) named: 'Ext files'.
@@ -23,7 +25,7 @@ StFBOpenFileDialogTest >> testExtensions [
 		equals: 'Ext files'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBOpenFileDialogTest >> testMultipleExtensions [
 
 	dialog extensions: #( image changes sources ) named: 'Src files'.
@@ -37,7 +39,7 @@ StFBOpenFileDialogTest >> testMultipleExtensions [
 		equals: 'Src files'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBOpenFileDialogTest >> testSelectFile [
 
 	| selectedFile |
diff --git a/src/NewTools-FileBrowser-Tests/StFBPNGFilterTest.class.st b/src/NewTools-FileBrowser-Tests/StFBPNGFilterTest.class.st
index 151f04b56..f93583bd6 100644
--- a/src/NewTools-FileBrowser-Tests/StFBPNGFilterTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBPNGFilterTest.class.st
@@ -2,17 +2,19 @@
 A FDPNGFilterTest is a test class for testing the behavior of FDPNGFilter
 "
 Class {
-	#name : #StFBPNGFilterTest,
-	#superclass : #StFBExtensionsFilterTest,
-	#category : #'NewTools-FileBrowser-Tests-Filtering'
+	#name : 'StFBPNGFilterTest',
+	#superclass : 'StFBExtensionsFilterTest',
+	#category : 'NewTools-FileBrowser-Tests-Filtering',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBPNGFilterTest >> actualClass [
 	^ StFBPNGFilter
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBPNGFilterTest >> testPredicate [
 	self assert: (filter predicate: (self fileNamed: 'image.png')).
 	self deny: (filter predicate: (self fileNamed: 'bitmap.bmp'))
diff --git a/src/NewTools-FileBrowser-Tests/StFBTestCase.class.st b/src/NewTools-FileBrowser-Tests/StFBTestCase.class.st
index 9980dd24c..0dd5ffdd7 100644
--- a/src/NewTools-FileBrowser-Tests/StFBTestCase.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBTestCase.class.st
@@ -1,34 +1,36 @@
 Class {
-	#name : #StFBTestCase,
-	#superclass : #TestCase,
+	#name : 'StFBTestCase',
+	#superclass : 'TestCase',
 	#instVars : [
 		'root'
 	],
-	#category : #'NewTools-FileBrowser-Tests-UI'
+	#category : 'NewTools-FileBrowser-Tests-UI',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'UI'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBTestCase class >> isAbstract [
 	^ self = StFBTestCase
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBTestCase class >> resources [
 	^ {StFBFileSystemResource}
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBTestCase class >> shouldInheritSelectors [
 	^ true
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StFBTestCase >> inspectRoot [
 	<script: 'self basicNew createRoot asFileReference inspect'>
 	
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StFBTestCase >> setUp [
 	super setUp.
 	root := StFBFileSystemResource current root
diff --git a/src/NewTools-FileBrowser-Tests/StFBVisibleFilterTest.class.st b/src/NewTools-FileBrowser-Tests/StFBVisibleFilterTest.class.st
index 5c4656821..b40aad6da 100644
--- a/src/NewTools-FileBrowser-Tests/StFBVisibleFilterTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBVisibleFilterTest.class.st
@@ -2,17 +2,19 @@
 A FDHidenFilterTest is a test class for testing the behavior of FDHidenFilter
 "
 Class {
-	#name : #StFBVisibleFilterTest,
-	#superclass : #StFBAbstractFilterTest,
-	#category : #'NewTools-FileBrowser-Tests-Filtering'
+	#name : 'StFBVisibleFilterTest',
+	#superclass : 'StFBAbstractFilterTest',
+	#category : 'NewTools-FileBrowser-Tests-Filtering',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBVisibleFilterTest >> actualClass [
 	^ StFBVisibleFilter
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBVisibleFilterTest >> testPredicate [
 
 	Smalltalk os isWindows ifTrue: [ 
diff --git a/src/NewTools-FileBrowser-Tests/StFBWindowPathPresenterTest.class.st b/src/NewTools-FileBrowser-Tests/StFBWindowPathPresenterTest.class.st
index 8917d0da0..1003f11a3 100644
--- a/src/NewTools-FileBrowser-Tests/StFBWindowPathPresenterTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBWindowPathPresenterTest.class.st
@@ -1,25 +1,27 @@
 Class {
-	#name : #StFBWindowPathPresenterTest,
-	#superclass : #StFBTestCase,
+	#name : 'StFBWindowPathPresenterTest',
+	#superclass : 'StFBTestCase',
 	#instVars : [
 		'windowPathUI'
 	],
-	#category : #'NewTools-FileBrowser-Tests-UI'
+	#category : 'NewTools-FileBrowser-Tests-UI',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'UI'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StFBWindowPathPresenterTest >> setUp [
 	super setUp.
 	windowPathUI := StFBWindowPathPresenter new
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StFBWindowPathPresenterTest >> tearDown [
 	windowPathUI withWindowDo: [ :window | window close ].
 	super tearDown
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBWindowPathPresenterTest >> testRoot [
 
 	windowPathUI currentDirectory: FileLocator root.
diff --git a/src/NewTools-FileBrowser-Tests/StFBWindowsExtensionsTest.class.st b/src/NewTools-FileBrowser-Tests/StFBWindowsExtensionsTest.class.st
index d9cc50cb3..1040abc8e 100644
--- a/src/NewTools-FileBrowser-Tests/StFBWindowsExtensionsTest.class.st
+++ b/src/NewTools-FileBrowser-Tests/StFBWindowsExtensionsTest.class.st
@@ -2,12 +2,14 @@
 A test specific to extensions for Windows OS platform
 "
 Class {
-	#name : #StFBWindowsExtensionsTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-FileBrowser-Tests-OS-Specific'
+	#name : 'StFBWindowsExtensionsTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-FileBrowser-Tests-OS-Specific',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'OS-Specific'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBWindowsExtensionsTest >> testWindowsAttributes [
 	"Calling the native API should not give an error on windows"
 	
@@ -16,7 +18,7 @@ StFBWindowsExtensionsTest >> testWindowsAttributes [
 	self assert: FileSystem workingDirectory windowsAttributes ~= -1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFBWindowsExtensionsTest >> testWindowsAttributesForMemoryFileSystem [
 	"Calling the native API should not give an error on windows"
 	
diff --git a/src/NewTools-FileBrowser-Tests/package.st b/src/NewTools-FileBrowser-Tests/package.st
index cdebb2532..81c1caf94 100644
--- a/src/NewTools-FileBrowser-Tests/package.st
+++ b/src/NewTools-FileBrowser-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-FileBrowser-Tests' }
+Package { #name : 'NewTools-FileBrowser-Tests' }
diff --git a/src/NewTools-FileBrowser/DateAndTime.extension.st b/src/NewTools-FileBrowser/DateAndTime.extension.st
index e506a481a..66cdf9b5c 100644
--- a/src/NewTools-FileBrowser/DateAndTime.extension.st
+++ b/src/NewTools-FileBrowser/DateAndTime.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #DateAndTime }
+Extension { #name : 'DateAndTime' }
 
-{ #category : #'*NewTools-FileBrowser' }
+{ #category : '*NewTools-FileBrowser' }
 DateAndTime >> fileDialogFormat [
 	^ '{1} {2} {3} {4}' format:
 		{self dayOfMonth asString.
diff --git a/src/NewTools-FileBrowser/FileReference.extension.st b/src/NewTools-FileBrowser/FileReference.extension.st
index d4b00c9c7..95bd7a9cb 100644
--- a/src/NewTools-FileBrowser/FileReference.extension.st
+++ b/src/NewTools-FileBrowser/FileReference.extension.st
@@ -1,16 +1,16 @@
-Extension { #name : #FileReference }
+Extension { #name : 'FileReference' }
 
-{ #category : #'*NewTools-FileBrowser' }
+{ #category : '*NewTools-FileBrowser' }
 FileReference >> isHiddenInWindows [
 	^ (self windowsAttributes & 16r2) = 1
 ]
 
-{ #category : #'*NewTools-FileBrowser' }
+{ #category : '*NewTools-FileBrowser' }
 FileReference >> windowsAttributes [
 	^ self windowsAttributes: self fullName asWin32WideString 
 ]
 
-{ #category : #'*NewTools-FileBrowser' }
+{ #category : '*NewTools-FileBrowser' }
 FileReference >> windowsAttributes: lpFileName [
 	^ self ffiCall: #(long GetFileAttributesW #(Win32WideString lpFileName)) library: #kernel32
 ]
diff --git a/src/NewTools-FileBrowser/SpSelectEntity.extension.st b/src/NewTools-FileBrowser/SpSelectEntity.extension.st
index 376512ea1..389cc19ba 100644
--- a/src/NewTools-FileBrowser/SpSelectEntity.extension.st
+++ b/src/NewTools-FileBrowser/SpSelectEntity.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #SpSelectEntity }
+Extension { #name : 'SpSelectEntity' }
 
-{ #category : #'*NewTools-FileBrowser' }
+{ #category : '*NewTools-FileBrowser' }
 SpSelectEntity class >> fDLayoutFileDialog [
 	^ SpBoxLayout newVertical
 		add: #entityText;
diff --git a/src/NewTools-FileBrowser/StFBAbstractBookMark.class.st b/src/NewTools-FileBrowser/StFBAbstractBookMark.class.st
index 37d55f607..b40125c47 100644
--- a/src/NewTools-FileBrowser/StFBAbstractBookMark.class.st
+++ b/src/NewTools-FileBrowser/StFBAbstractBookMark.class.st
@@ -11,41 +11,43 @@ icon <Form>
 name <Form> 
 "
 Class {
-	#name : #StFBAbstractBookMark,
-	#superclass : #Object,
+	#name : 'StFBAbstractBookMark',
+	#superclass : 'Object',
 	#instVars : [
 		'name',
 		'icon'
 	],
-	#category : #'NewTools-FileBrowser-Bookmark'
+	#category : 'NewTools-FileBrowser-Bookmark',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Bookmark'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractBookMark >> children [ 
 	^ self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractBookMark >> icon [
 	^ icon
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractBookMark >> icon: anObject [
 	icon := anObject
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBAbstractBookMark >> isComposite [
 	^ self subclassResponsibility.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractBookMark >> name [
 	^ name
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractBookMark >> name: anObject [
 	name := anObject
 ]
diff --git a/src/NewTools-FileBrowser/StFBAbstractColumn.class.st b/src/NewTools-FileBrowser/StFBAbstractColumn.class.st
index 8c2497779..8bbe89bf2 100644
--- a/src/NewTools-FileBrowser/StFBAbstractColumn.class.st
+++ b/src/NewTools-FileBrowser/StFBAbstractColumn.class.st
@@ -10,12 +10,14 @@ My subclasses will each represent a concrete column and define:
 - Optionally, how to customize the column
 "
 Class {
-	#name : #StFBAbstractColumn,
-	#superclass : #Object,
-	#category : #'NewTools-FileBrowser-Columns'
+	#name : 'StFBAbstractColumn',
+	#superclass : 'Object',
+	#category : 'NewTools-FileBrowser-Columns',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Columns'
 }
 
-{ #category : #adding }
+{ #category : 'adding' }
 StFBAbstractColumn class >> addContraintTo: aTableColumn [
 	"I'm use to add option to column like width ... 
 	look at class 
@@ -23,7 +25,7 @@ StFBAbstractColumn class >> addContraintTo: aTableColumn [
 	self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractColumn class >> column [
 	"I'm returning a SpTreeTableColumn"
 
@@ -33,37 +35,37 @@ StFBAbstractColumn class >> column [
 	^ column
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractColumn class >> columns [
 	^ ((self allSubclasses reject: #isAbstract) sort: #priority ascending) collect: #column
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBAbstractColumn class >> contentValuable [
 	^ [ :selectedFileReference | self evaluateOn: selectedFileReference ]
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBAbstractColumn class >> evaluateOn: aFileReference [ 
 	^ self subclassResponsibility
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBAbstractColumn class >> isAbstract [ 
 	^ self = StFBAbstractColumn
 ]
 
-{ #category : #sorting }
+{ #category : 'sorting' }
 StFBAbstractColumn class >> priority [
 	^ self subclassResponsibility
 ]
 
-{ #category : #class }
+{ #category : 'class' }
 StFBAbstractColumn class >> tableColumnClass [
 	^ SpStringTableColumn
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBAbstractColumn class >> title [
 	"I'm returning a String"
 	^ self subclassResponsibility
diff --git a/src/NewTools-FileBrowser/StFBAbstractFilter.class.st b/src/NewTools-FileBrowser/StFBAbstractFilter.class.st
index f0366d19a..18bae7074 100644
--- a/src/NewTools-FileBrowser/StFBAbstractFilter.class.st
+++ b/src/NewTools-FileBrowser/StFBAbstractFilter.class.st
@@ -11,26 +11,28 @@ Public API and Key Messages
 
 "
 Class {
-	#name : #StFBAbstractFilter,
-	#superclass : #Object,
+	#name : 'StFBAbstractFilter',
+	#superclass : 'Object',
 	#traits : 'TComparable',
 	#classTraits : 'TComparable classTrait',
-	#category : #'NewTools-FileBrowser-Filtering'
+	#category : 'NewTools-FileBrowser-Filtering',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Filtering'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBAbstractFilter class >> canBeDefault [
 	^ self isAbstract not
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StFBAbstractFilter class >> defaultFilters [
 
 	^ ((self allSubclasses select: #canBeDefault) sorted:
 		   #priority descending) collect: #new
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StFBAbstractFilter class >> defaultFiltersWith: aFilter [
 
 	| defaultFilters |
@@ -39,17 +41,17 @@ StFBAbstractFilter class >> defaultFiltersWith: aFilter [
 	^ { aFilter } , self defaultFilters
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBAbstractFilter class >> isAbstract [
 	^ self = StFBAbstractFilter
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractFilter class >> priority [
 	^ 1
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StFBAbstractFilter >> < aComparable [
 
 	"Answer whether the receiver is less than the argument."
@@ -57,7 +59,7 @@ StFBAbstractFilter >> < aComparable [
 	^ self class priority < aComparable class priority
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StFBAbstractFilter >> = aComparable [
 
 	"Double dispatch"
@@ -65,18 +67,18 @@ StFBAbstractFilter >> = aComparable [
 	^ aComparable equalsToNonExtensionFilter: self
 ]
 
-{ #category : #adding }
+{ #category : 'adding' }
 StFBAbstractFilter >> addExtensionTo: aFileReference [
 
 	^ aFileReference
 ]
 
-{ #category : #applying }
+{ #category : 'applying' }
 StFBAbstractFilter >> applyOn: aCollectionOfFileReference [
 	^ aCollectionOfFileReference select: [ :eachFileReference | self predicate: eachFileReference ]
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StFBAbstractFilter >> equalsToExtensionFilter: aExtensionFilter [
 
 	"Compare the receiver with the argument and answer with true if the 
@@ -85,7 +87,7 @@ StFBAbstractFilter >> equalsToExtensionFilter: aExtensionFilter [
 	^ self class = aExtensionFilter class
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StFBAbstractFilter >> equalsToNonExtensionFilter: aFilter [
 
 	"Compare the receiver with the argument and answer with true if the 
@@ -94,7 +96,7 @@ StFBAbstractFilter >> equalsToNonExtensionFilter: aFilter [
 	^ self class = aFilter class
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StFBAbstractFilter >> hash [
 
 	"Hash must be redefined whenever = is redefined."
@@ -102,14 +104,14 @@ StFBAbstractFilter >> hash [
 	^ self class priority
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractFilter >> name [
 	"Name of the filter to display in the UI."
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAbstractFilter >> predicate: aFileReference [
 	"I should answer true if the filter should display the file reference as parameter and false if it should filter it."
 
diff --git a/src/NewTools-FileBrowser/StFBAbstractPreviewer.class.st b/src/NewTools-FileBrowser/StFBAbstractPreviewer.class.st
index 68a653c10..9ae487e7c 100644
--- a/src/NewTools-FileBrowser/StFBAbstractPreviewer.class.st
+++ b/src/NewTools-FileBrowser/StFBAbstractPreviewer.class.st
@@ -10,17 +10,19 @@ my subclasses have to define :
 	return a Presenter (son of SpPresenter)  
 "
 Class {
-	#name : #StFBAbstractPreviewer,
-	#superclass : #Object,
-	#category : #'NewTools-FileBrowser-Previewers'
+	#name : 'StFBAbstractPreviewer',
+	#superclass : 'Object',
+	#category : 'NewTools-FileBrowser-Previewers',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Previewers'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBAbstractPreviewer class >> isAbstract [
 	^ self = StFBAbstractPreviewer
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBAbstractPreviewer >> canBeUsedOn: aFileReference [
 
 	aFileReference ifNil: [ ^ false ].
@@ -29,18 +31,18 @@ StFBAbstractPreviewer >> canBeUsedOn: aFileReference [
 			  self matchingMimeType: aZnMimeType ] ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBAbstractPreviewer >> matchingMimeType: aZnMimeType [
 	"return a Boolean to indicate if element matches"
 	^ self subclassResponsibility 
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBAbstractPreviewer >> previewActionOn: aFileReference [
 	^ self subclassResponsibility
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 StFBAbstractPreviewer >> previewOn: aFileReference [
 	(self canBeUsedOn: aFileReference)
 		ifTrue: [ ^ self previewActionOn: aFileReference ].
diff --git a/src/NewTools-FileBrowser/StFBAddBookmarkCommand.class.st b/src/NewTools-FileBrowser/StFBAddBookmarkCommand.class.st
index 90b601a4d..42f80bc4a 100644
--- a/src/NewTools-FileBrowser/StFBAddBookmarkCommand.class.st
+++ b/src/NewTools-FileBrowser/StFBAddBookmarkCommand.class.st
@@ -2,24 +2,26 @@
 I'm a command use to add bookmark
 "
 Class {
-	#name : #StFBAddBookmarkCommand,
-	#superclass : #CmCommand,
-	#category : #'NewTools-FileBrowser-Commands'
+	#name : 'StFBAddBookmarkCommand',
+	#superclass : 'CmCommand',
+	#category : 'NewTools-FileBrowser-Commands',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Commands'
 }
 
-{ #category : #converting }
+{ #category : 'converting' }
 StFBAddBookmarkCommand >> asSpecCommand [
 	^ super asSpecCommand
 		iconName: #add;
 		yourself
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBAddBookmarkCommand >> canBeExecuted [
 	^ self context selectedEntry isDirectory
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StFBAddBookmarkCommand >> execute [
 	| fileReference |
 	fileReference := self context selectedEntry.
@@ -28,7 +30,7 @@ StFBAddBookmarkCommand >> execute [
 	self context owner bookmarksTreeTable roots: self context owner bookmarks
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBAddBookmarkCommand >> initialize [
 	super initialize.
 	self
diff --git a/src/NewTools-FileBrowser/StFBAllFilter.class.st b/src/NewTools-FileBrowser/StFBAllFilter.class.st
index 02ac18bdd..cfd1a3b39 100644
--- a/src/NewTools-FileBrowser/StFBAllFilter.class.st
+++ b/src/NewTools-FileBrowser/StFBAllFilter.class.st
@@ -2,22 +2,24 @@
 I am a filter that will select anything (does not reject any item).
 "
 Class {
-	#name : #StFBAllFilter,
-	#superclass : #StFBAbstractFilter,
-	#category : #'NewTools-FileBrowser-Filtering'
+	#name : 'StFBAllFilter',
+	#superclass : 'StFBAbstractFilter',
+	#category : 'NewTools-FileBrowser-Filtering',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAllFilter class >> priority [
 	^ 150
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAllFilter >> name [
 	^ 'All'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBAllFilter >> predicate: aFileReference [
 	^ true
 ]
diff --git a/src/NewTools-FileBrowser/StFBBitmapFilter.class.st b/src/NewTools-FileBrowser/StFBBitmapFilter.class.st
index baf0faa43..cc6c936c8 100644
--- a/src/NewTools-FileBrowser/StFBBitmapFilter.class.st
+++ b/src/NewTools-FileBrowser/StFBBitmapFilter.class.st
@@ -2,17 +2,19 @@
 I am a filter selecting files with a bitmap extension.
 "
 Class {
-	#name : #StFBBitmapFilter,
-	#superclass : #StFBExtensionsFilter,
-	#category : #'NewTools-FileBrowser-Filtering'
+	#name : 'StFBBitmapFilter',
+	#superclass : 'StFBExtensionsFilter',
+	#category : 'NewTools-FileBrowser-Filtering',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBBitmapFilter >> basename [
 	^ 'Bitmap'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBBitmapFilter >> extensions [
 	^ #('bmp' 'dib')
 ]
diff --git a/src/NewTools-FileBrowser/StFBBookmark.class.st b/src/NewTools-FileBrowser/StFBBookmark.class.st
index e6cbeaa73..f2dd759ad 100644
--- a/src/NewTools-FileBrowser/StFBBookmark.class.st
+++ b/src/NewTools-FileBrowser/StFBBookmark.class.st
@@ -2,15 +2,17 @@
 I represent a bookmark having location, icon, and a name.
 "
 Class {
-	#name : #StFBBookmark,
-	#superclass : #StFBAbstractBookMark,
+	#name : 'StFBBookmark',
+	#superclass : 'StFBAbstractBookMark',
 	#instVars : [
 		'location'
 	],
-	#category : #'NewTools-FileBrowser-Bookmark'
+	#category : 'NewTools-FileBrowser-Bookmark',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Bookmark'
 }
 
-{ #category : #defaultClassVariable }
+{ #category : 'defaultClassVariable' }
 StFBBookmark class >> defaultBookmarks [
 
 	| presets |
@@ -33,7 +35,7 @@ StFBBookmark class >> defaultBookmarks [
 			   iconName: '')
 ]
 
-{ #category : #'default bookmarks' }
+{ #category : 'default bookmarks' }
 StFBBookmark class >> desktop [
 	^ self
 		name: 'Desktop'
@@ -41,7 +43,7 @@ StFBBookmark class >> desktop [
 		icon: (self iconNamed: #morph)
 ]
 
-{ #category : #'default bookmarks' }
+{ #category : 'default bookmarks' }
 StFBBookmark class >> documents [
 	^ self
 		name: 'Documents'
@@ -49,7 +51,7 @@ StFBBookmark class >> documents [
 		icon: (self iconNamed: #book)
 ]
 
-{ #category : #'default bookmarks' }
+{ #category : 'default bookmarks' }
 StFBBookmark class >> downloads [
 	^ self
 		name: 'Downloads'
@@ -57,7 +59,7 @@ StFBBookmark class >> downloads [
 		icon: (self iconNamed: #down)
 ]
 
-{ #category : #'default bookmarks' }
+{ #category : 'default bookmarks' }
 StFBBookmark class >> home [
 	^ self
 		name: 'Home'
@@ -65,7 +67,7 @@ StFBBookmark class >> home [
 		icon: (self iconNamed: #home)
 ]
 
-{ #category : #'default bookmarks' }
+{ #category : 'default bookmarks' }
 StFBBookmark class >> image [
 	^ self
 		name: 'Image directory'
@@ -73,7 +75,7 @@ StFBBookmark class >> image [
 		icon: (self iconNamed: #komitterNewSlice)
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StFBBookmark class >> name: aName location: aLocation icon: anIcon [
 	^ self new
 		name: aName;
@@ -82,7 +84,7 @@ StFBBookmark class >> name: aName location: aLocation icon: anIcon [
 		yourself
 ]
 
-{ #category : #'default bookmarks' }
+{ #category : 'default bookmarks' }
 StFBBookmark class >> root [
 
 	^ self
@@ -91,7 +93,7 @@ StFBBookmark class >> root [
 		  icon: (self iconNamed: #smallWindow)
 ]
 
-{ #category : #'default bookmarks' }
+{ #category : 'default bookmarks' }
 StFBBookmark class >> tmp [
 	^ StFBBookmark
 		name: 'tmp'
@@ -99,7 +101,7 @@ StFBBookmark class >> tmp [
 		icon: Smalltalk ui icons open
 ]
 
-{ #category : #'default bookmarks' }
+{ #category : 'default bookmarks' }
 StFBBookmark class >> windowsDrives [
 
 	^ FileLocator root asFileReference directories collect: [ :each | 
@@ -109,7 +111,7 @@ StFBBookmark class >> windowsDrives [
 			  icon: Smalltalk ui icons smallWindow ]
 ]
 
-{ #category : #'default bookmarks' }
+{ #category : 'default bookmarks' }
 StFBBookmark class >> workingDirectory [
 	^ self
 		name: 'Working directory'
@@ -117,7 +119,7 @@ StFBBookmark class >> workingDirectory [
 		icon: (self iconNamed: #komitterNewSlice) 
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StFBBookmark >> = aBookmark [
 	self species = aBookmark species
 		ifFalse: [ ^ false ].
@@ -125,52 +127,52 @@ StFBBookmark >> = aBookmark [
 		& (self name = aBookmark name)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBBookmark >> children [ 
 	^ {  }
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StFBBookmark >> hash [
 	^ (self icon hash bitXor: self location hash) bitXor: self name hash
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBBookmark >> icon [
 	^ icon
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBBookmark >> icon: anIcon [
 	icon := anIcon
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBBookmark >> isComposite [
 	^ false
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBBookmark >> location [
 	^ location
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBBookmark >> location: aFileReference [
 	location := aFileReference
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBBookmark >> name [
 	^ name
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBBookmark >> name: aString [
 	name := aString
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StFBBookmark >> printOn: aStream [
 	super printOn: aStream.
 	aStream
diff --git a/src/NewTools-FileBrowser/StFBContentPreviewer.class.st b/src/NewTools-FileBrowser/StFBContentPreviewer.class.st
index 9ed6b55c0..933940ea0 100644
--- a/src/NewTools-FileBrowser/StFBContentPreviewer.class.st
+++ b/src/NewTools-FileBrowser/StFBContentPreviewer.class.st
@@ -2,23 +2,25 @@
 I'm a previewer use to display the text content of a file 
 "
 Class {
-	#name : #StFBContentPreviewer,
-	#superclass : #StFBAbstractPreviewer,
-	#category : #'NewTools-FileBrowser-Previewers'
+	#name : 'StFBContentPreviewer',
+	#superclass : 'StFBAbstractPreviewer',
+	#category : 'NewTools-FileBrowser-Previewers',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Previewers'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBContentPreviewer >> canBeUsedOn: aFileReference [
 	^ aFileReference isFile
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBContentPreviewer >> matchingMimeType: aZnMimeType [
 	"return a Boolean to indicate if element matches"
 	^ true
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBContentPreviewer >> previewActionOn: aFileReference [
 
 	^ SpTextPresenter new text: ([ 
diff --git a/src/NewTools-FileBrowser/StFBCreationDateColumn.class.st b/src/NewTools-FileBrowser/StFBCreationDateColumn.class.st
index b87834d3b..1b1580376 100644
--- a/src/NewTools-FileBrowser/StFBCreationDateColumn.class.st
+++ b/src/NewTools-FileBrowser/StFBCreationDateColumn.class.st
@@ -2,27 +2,29 @@
 I'm a column use to display the creation date of a file in a File dialog.
 "
 Class {
-	#name : #StFBCreationDateColumn,
-	#superclass : #StFBAbstractColumn,
-	#category : #'NewTools-FileBrowser-Columns'
+	#name : 'StFBCreationDateColumn',
+	#superclass : 'StFBAbstractColumn',
+	#category : 'NewTools-FileBrowser-Columns',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Columns'
 }
 
-{ #category : #adding }
+{ #category : 'adding' }
 StFBCreationDateColumn class >> addContraintTo: aTableColumn [
 	aTableColumn width: 150
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBCreationDateColumn class >> evaluateOn: aFileReference [
 	^ aFileReference creationTime fileDialogFormat
 ]
 
-{ #category : #sorting }
+{ #category : 'sorting' }
 StFBCreationDateColumn class >> priority [
 	^ 60
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBCreationDateColumn class >> title [
 	^ 'Date Created'
 ]
diff --git a/src/NewTools-FileBrowser/StFBCustomExtensionsFilter.class.st b/src/NewTools-FileBrowser/StFBCustomExtensionsFilter.class.st
index 0150501a2..ceab17756 100644
--- a/src/NewTools-FileBrowser/StFBCustomExtensionsFilter.class.st
+++ b/src/NewTools-FileBrowser/StFBCustomExtensionsFilter.class.st
@@ -1,20 +1,22 @@
 Class {
-	#name : #StFBCustomExtensionsFilter,
-	#superclass : #StFBExtensionsFilter,
+	#name : 'StFBCustomExtensionsFilter',
+	#superclass : 'StFBExtensionsFilter',
 	#instVars : [
 		'extensions',
 		'basename'
 	],
-	#category : #'NewTools-FileBrowser-Filtering'
+	#category : 'NewTools-FileBrowser-Filtering',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Filtering'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBCustomExtensionsFilter class >> canBeDefault [
 
 	^ false
 ]
 
-{ #category : #'accessing - Class' }
+{ #category : 'accessing - Class' }
 StFBCustomExtensionsFilter class >> extensions: aCollection [
 
 	^ self new
@@ -22,7 +24,7 @@ StFBCustomExtensionsFilter class >> extensions: aCollection [
 		  yourself
 ]
 
-{ #category : #'accessing - Class' }
+{ #category : 'accessing - Class' }
 StFBCustomExtensionsFilter class >> extensions: aCollection basename: aString [
 
 	^ self new
@@ -31,37 +33,37 @@ StFBCustomExtensionsFilter class >> extensions: aCollection basename: aString [
 		  yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBCustomExtensionsFilter class >> priority [
 	^ 20
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBCustomExtensionsFilter >> basename [
 
 	^ basename ifNil: [ '-' ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBCustomExtensionsFilter >> basename: aString [
 
 	basename := aString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBCustomExtensionsFilter >> extensions [
 
 	^ extensions
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBCustomExtensionsFilter >> extensions: aCollection [
 
 	extensions := aCollection.
 	basename ifNil: [ basename := extensions asCommaString ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBCustomExtensionsFilter >> initialize [
 
 	super initialize.
diff --git a/src/NewTools-FileBrowser/StFBDirectoryFilter.class.st b/src/NewTools-FileBrowser/StFBDirectoryFilter.class.st
index bb6884286..07c367737 100644
--- a/src/NewTools-FileBrowser/StFBDirectoryFilter.class.st
+++ b/src/NewTools-FileBrowser/StFBDirectoryFilter.class.st
@@ -2,22 +2,24 @@
 I am a filter that will only select directories. I will reject all the files of the FileDialog.
 "
 Class {
-	#name : #StFBDirectoryFilter,
-	#superclass : #StFBAbstractFilter,
-	#category : #'NewTools-FileBrowser-Filtering'
+	#name : 'StFBDirectoryFilter',
+	#superclass : 'StFBAbstractFilter',
+	#category : 'NewTools-FileBrowser-Filtering',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBDirectoryFilter class >> priority [
 	^ 130
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBDirectoryFilter >> name [
 	^ 'Folders'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBDirectoryFilter >> predicate: aFileReference [
 
 	^ aFileReference isDirectory and: [ 
diff --git a/src/NewTools-FileBrowser/StFBExtensionsFilter.class.st b/src/NewTools-FileBrowser/StFBExtensionsFilter.class.st
index 7922c9e58..05ceb3a64 100644
--- a/src/NewTools-FileBrowser/StFBExtensionsFilter.class.st
+++ b/src/NewTools-FileBrowser/StFBExtensionsFilter.class.st
@@ -10,22 +10,24 @@ Public API and Key Messages
 - #extensions 	Return the collection of extensions we should keep with this filter.
 "
 Class {
-	#name : #StFBExtensionsFilter,
-	#superclass : #StFBAbstractFilter,
-	#category : #'NewTools-FileBrowser-Filtering'
+	#name : 'StFBExtensionsFilter',
+	#superclass : 'StFBAbstractFilter',
+	#category : 'NewTools-FileBrowser-Filtering',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Filtering'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBExtensionsFilter class >> isAbstract [
 	^ self = StFBExtensionsFilter
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBExtensionsFilter class >> priority [
 	^ 50
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StFBExtensionsFilter >> = aComparable [
 
 	"Double dispatch"
@@ -33,7 +35,7 @@ StFBExtensionsFilter >> = aComparable [
 	^ aComparable equalsToExtensionFilter: self
 ]
 
-{ #category : #adding }
+{ #category : 'adding' }
 StFBExtensionsFilter >> addExtensionTo: aFileReference [
 
 	(self predicate: aFileReference) ifTrue: [ ^ aFileReference ].
@@ -41,12 +43,12 @@ StFBExtensionsFilter >> addExtensionTo: aFileReference [
 	^ aFileReference , (self extensions first copyWithout: $.)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBExtensionsFilter >> basename [
 	^ self subclassResponsibility
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StFBExtensionsFilter >> equalsToExtensionFilter: aExtensionFilter [
 
 	"Compare the receiver with the argument and answer with true if the 
@@ -55,14 +57,14 @@ StFBExtensionsFilter >> equalsToExtensionFilter: aExtensionFilter [
 	^ self extensions asSet = aExtensionFilter extensions asSet
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBExtensionsFilter >> extensions [
 	"Should return sequenceable collection of extensions"
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 StFBExtensionsFilter >> extensionsWithDots [
 
 	^ self extensions collect: [ :each | 
@@ -71,7 +73,7 @@ StFBExtensionsFilter >> extensionsWithDots [
 			  ifFalse: [ '.' , each ] ]
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StFBExtensionsFilter >> hash [
 
 	"Hash must be redefined whenever = is redefined."
@@ -79,7 +81,7 @@ StFBExtensionsFilter >> hash [
 	^ self extensionsWithDots hash
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBExtensionsFilter >> name [
 	^ String
 		streamContents: [ :s | 
@@ -96,7 +98,7 @@ StFBExtensionsFilter >> name [
 			s nextPut: $) ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBExtensionsFilter >> predicate: aFileReference [
 
 	aFileReference isDirectory ifTrue: [ ^ true ].
diff --git a/src/NewTools-FileBrowser/StFBFileDialogPresenter.class.st b/src/NewTools-FileBrowser/StFBFileDialogPresenter.class.st
index a3447637f..71724d51a 100644
--- a/src/NewTools-FileBrowser/StFBFileDialogPresenter.class.st
+++ b/src/NewTools-FileBrowser/StFBFileDialogPresenter.class.st
@@ -65,8 +65,8 @@ icons
 
 "
 Class {
-	#name : #StFBFileDialogPresenter,
-	#superclass : #StPresenter,
+	#name : 'StFBFileDialogPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'bookmarksTreeTable',
 		'bookmarks',
@@ -79,10 +79,12 @@ Class {
 		'Bookmarks',
 		'OkAction'
 	],
-	#category : #'NewTools-FileBrowser-UI'
+	#category : 'NewTools-FileBrowser-UI',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'UI'
 }
 
-{ #category : #icons }
+{ #category : 'icons' }
 StFBFileDialogPresenter class >> allIcons [
 	<script: 'self allIcons inspect'>
 	^ (Pragma allNamed: 'icons' in: StFBFileDialogPresenter class)
@@ -90,7 +92,7 @@ StFBFileDialogPresenter class >> allIcons [
 			[ :pragma | pragma methodClass instanceSide perform: pragma methodSelector ]
 ]
 
-{ #category : #commander2 }
+{ #category : 'commander2' }
 StFBFileDialogPresenter class >> buildCommandsGroupWith: presenter forRoot: rootCommandGroup [
 	rootCommandGroup
 		register:
@@ -99,7 +101,7 @@ StFBFileDialogPresenter class >> buildCommandsGroupWith: presenter forRoot: root
 				yourself)
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBFileDialogPresenter class >> chooseModal [
 
 	"Return selected item immediately (blocking/modal). Returns nil if no valid item selected"
@@ -107,13 +109,13 @@ StFBFileDialogPresenter class >> chooseModal [
 	^ self new openModal
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBFileDialogPresenter class >> chooseModalAndInspect [
 
 	^ self chooseModal inspect
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBFileDialogPresenter class >> chooseModalIfNone: aBlock [
 
 	"Return selected item immediately (blocking/modal). Returns nil if no valid item selected"
@@ -121,7 +123,7 @@ StFBFileDialogPresenter class >> chooseModalIfNone: aBlock [
 	^ self chooseModal ifNil: aBlock
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBFileDialogPresenter class >> chooseThenDo: aBlock [
 
 	"Return selected item immediately (blocking/modal). Returns nil if no valid item selected"
@@ -132,13 +134,13 @@ StFBFileDialogPresenter class >> chooseThenDo: aBlock [
 		  open
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBFileDialogPresenter class >> chooseThenInspect [
 
 	^ self chooseThenDo: [ :file | file inspect ]
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StFBFileDialogPresenter class >> defaultLayout [
 
 	^ SpPanedLayout newLeftToRight
@@ -148,12 +150,12 @@ StFBFileDialogPresenter class >> defaultLayout [
 		  yourself
 ]
 
-{ #category : #defaultClassVariable }
+{ #category : 'defaultClassVariable' }
 StFBFileDialogPresenter class >> defaultOkActionBlock [
 	^ [ :fileReference | fileReference ]
 ]
 
-{ #category : #'accessing - Class' }
+{ #category : 'accessing - Class' }
 StFBFileDialogPresenter class >> extensions: aCollectionOfExtensions [
 
 	^ self new
@@ -162,7 +164,7 @@ StFBFileDialogPresenter class >> extensions: aCollectionOfExtensions [
 		  yourself
 ]
 
-{ #category : #'accessing - Class' }
+{ #category : 'accessing - Class' }
 StFBFileDialogPresenter class >> extensions: aCollectionOfExtensions named: aString [
 
 	^ self new
@@ -171,77 +173,77 @@ StFBFileDialogPresenter class >> extensions: aCollectionOfExtensions named: aStr
 		  yourself
 ]
 
-{ #category : #'class initialization' }
+{ #category : 'class initialization' }
 StFBFileDialogPresenter class >> initialize [
 	OkAction := self defaultOkActionBlock.
 	Bookmarks := StFBBookmark defaultBookmarks
 ]
 
-{ #category : #icons }
+{ #category : 'icons' }
 StFBFileDialogPresenter class >> textIcons [
 	<icons>
 	^ {(#st -> (self iconNamed: #smallLeftFlush)).
 	(#txt -> (self iconNamed: #smallLeftFlush))}
 ]
 
-{ #category : #hooks }
+{ #category : 'hooks' }
 StFBFileDialogPresenter >> allowsChooseDirectoryIfNoFilename [
 
 	^ false
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogPresenter >> bookmarks [
 	^ bookmarks
 ]
 
-{ #category : #'api - customization' }
+{ #category : 'api - customization' }
 StFBFileDialogPresenter >> bookmarks: aCollectionOfFDGroupBookMark [
 	bookmarks := aCollectionOfFDGroupBookMark asOrderedCollection.
 	bookmarksTreeTable roots: bookmarks 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogPresenter >> bookmarksTreeTable [
 	^ bookmarksTreeTable
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StFBFileDialogPresenter >> cancelLabel [
 
 	^ 'Cancel'
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBFileDialogPresenter >> cancelled [
 
 	^ self withWindowDo: [ :w | w cancelled ]
 ]
 
-{ #category : #'api - customization' }
+{ #category : 'api - customization' }
 StFBFileDialogPresenter >> columns: aCollectionOfColumns [
 	fileNavigationSystem columns: aCollectionOfColumns 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StFBFileDialogPresenter >> confirm [
 
 	self withWindowDo: #triggerOkAction
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StFBFileDialogPresenter >> confirmLabel [
 
 	^ 'Accept'
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StFBFileDialogPresenter >> confirmed [
 
 	okAction cull: self selectedEntry
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileDialogPresenter >> connectPresenters [
 
 	bookmarksTreeTable whenSelectionChangedDo: [ :selection | 
@@ -250,30 +252,30 @@ StFBFileDialogPresenter >> connectPresenters [
 				fileNavigationSystem openFolder: selectedItem location ] ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogPresenter >> currentDirectory [
 	^ fileNavigationSystem currentDirectory 
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 StFBFileDialogPresenter >> defaultFolder [
 
 	^ FileLocator imageDirectory asFileReference
 ]
 
-{ #category : #'api - customization' }
+{ #category : 'api - customization' }
 StFBFileDialogPresenter >> defaultFolder: aPath [
 	fileNavigationSystem defaultFolder: aPath
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogPresenter >> extensions: aCollectionOfExtensions [
 
 	self filter:
 		(StFBCustomExtensionsFilter extensions: aCollectionOfExtensions)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogPresenter >> extensions: aCollectionOfExtensions named: aString [
 
 	self filter: (StFBCustomExtensionsFilter
@@ -281,24 +283,24 @@ StFBFileDialogPresenter >> extensions: aCollectionOfExtensions named: aString [
 			 basename: aString)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogPresenter >> fileNavigationSystem [
 	^ fileNavigationSystem
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogPresenter >> fileReferenceTable [
 	^ fileNavigationSystem fileReferenceTable
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogPresenter >> filter: aStFBFilter [
 
 	filter := aStFBFilter.
 	fileNavigationSystem ifNotNil: [ fileNavigationSystem filter: filter ]
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 StFBFileDialogPresenter >> iconFor: anEntry [
 
 	| ext |
@@ -310,7 +312,7 @@ StFBFileDialogPresenter >> iconFor: anEntry [
 		  ifAbsent: [ self iconNamed: #page ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileDialogPresenter >> initialize [
 
 	bookmarks := Bookmarks.
@@ -320,7 +322,7 @@ StFBFileDialogPresenter >> initialize [
 	super initialize
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileDialogPresenter >> initializeBookmarksTreeTable [
 
 	bookmarksTreeTable
@@ -339,7 +341,7 @@ StFBFileDialogPresenter >> initializeBookmarksTreeTable [
 		expandRoots
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileDialogPresenter >> initializeConfirmButton: aButton [
 
 	| buttonEnableBlock |
@@ -350,7 +352,7 @@ StFBFileDialogPresenter >> initializeConfirmButton: aButton [
 	buttonEnableBlock value: fileNavigationSystem nameText text
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileDialogPresenter >> initializeDialogWindow: aDialogWindowPresenter [
 
 	| confirmButton |
@@ -368,7 +370,7 @@ StFBFileDialogPresenter >> initializeDialogWindow: aDialogWindowPresenter [
 	self initializeConfirmButton: confirmButton
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileDialogPresenter >> initializePresenters [
 
 	bookmarksTreeTable := self newTreeTable.
@@ -379,7 +381,7 @@ StFBFileDialogPresenter >> initializePresenters [
 	self initializeBookmarksTreeTable
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileDialogPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter
@@ -387,41 +389,41 @@ StFBFileDialogPresenter >> initializeWindow: aWindowPresenter [
 		initialExtent: 1050 @ 750
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogPresenter >> isRootDirectory: aDirectory [
 	^ aDirectory isRoot or: [ OSPlatform current isWindows and: [ aDirectory parent isRoot ] ]
 ]
 
-{ #category : #'api - customization' }
+{ #category : 'api - customization' }
 StFBFileDialogPresenter >> isolate [
 	bookmarks := bookmarks copy.
 	
 ]
 
-{ #category : #'api - customization' }
+{ #category : 'api - customization' }
 StFBFileDialogPresenter >> okAction: aOneArgBlock [
 	okAction := aOneArgBlock
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 StFBFileDialogPresenter >> open [
 
 	^ self openDialog
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 StFBFileDialogPresenter >> openModal [
 
 	super openModal cancelled ifTrue: [ ^ nil ].
 	^ self selectedEntry
 ]
 
-{ #category : #'api - customization' }
+{ #category : 'api - customization' }
 StFBFileDialogPresenter >> previewer: aPreviewer [ 
 	fileNavigationSystem previewer: aPreviewer
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 StFBFileDialogPresenter >> selectFile: aFile [
 
 	fileNavigationSystem selectedEntry = aFile ifFalse: [ 
@@ -430,12 +432,12 @@ StFBFileDialogPresenter >> selectFile: aFile [
 	fileNavigationSystem nameText text: aFile basename
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogPresenter >> selectedBookMark [
 	^ bookmarksTreeTable selection selectedItem
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogPresenter >> selectedEntry [
 
 	| entry |
@@ -447,19 +449,19 @@ StFBFileDialogPresenter >> selectedEntry [
 	^ entry
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileDialogPresenter >> showDirectory: aFileReference [
 
 	fileNavigationSystem currentDirectory: aFileReference
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StFBFileDialogPresenter >> title [
 
 	^ title ifNil: [ self initialTitle ]
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StFBFileDialogPresenter >> title: aString [
 
 	title := aString
diff --git a/src/NewTools-FileBrowser/StFBFileFilter.class.st b/src/NewTools-FileBrowser/StFBFileFilter.class.st
index 829d408c8..d99f98a88 100644
--- a/src/NewTools-FileBrowser/StFBFileFilter.class.st
+++ b/src/NewTools-FileBrowser/StFBFileFilter.class.st
@@ -2,42 +2,44 @@
 I am a filter that will only select files. I will reject all the directories of the FileDialog.
 "
 Class {
-	#name : #StFBFileFilter,
-	#superclass : #StFBAbstractFilter,
-	#category : #'NewTools-FileBrowser-Filtering'
+	#name : 'StFBFileFilter',
+	#superclass : 'StFBAbstractFilter',
+	#category : 'NewTools-FileBrowser-Filtering',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileFilter class >> priority [
 	^ 130
 ]
 
-{ #category : #filters }
+{ #category : 'filters' }
 StFBFileFilter >> directoriesOnly: aCollection [
 	^ aCollection select: #isDirectory
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StFBFileFilter >> files: aCollection matching: patterns [
 	^ aCollection select: [ :each | each isDirectory or: [ patterns anySatisfy: [ :pat | pat match: each basename ] ] ]
 ]
 
-{ #category : #filters }
+{ #category : 'filters' }
 StFBFileFilter >> files: aCollection withExtensions: extensions [
 	^ aCollection reject: [ :each | each isFile & (extensions includes: each extension) not ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileFilter >> name [
 	^ 'Files'
 ]
 
-{ #category : #filters }
+{ #category : 'filters' }
 StFBFileFilter >> noHiddenFiles: aCollection [
 	^ aCollection reject: [ :each | (each basename beginsWith: '.') and: [ (each basename = '..') not ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileFilter >> predicate: aFileReference [
 	^ aFileReference isFile
 	
diff --git a/src/NewTools-FileBrowser/StFBFileNavigationSystemPresenter.class.st b/src/NewTools-FileBrowser/StFBFileNavigationSystemPresenter.class.st
index 7847f90e2..856a45adb 100644
--- a/src/NewTools-FileBrowser/StFBFileNavigationSystemPresenter.class.st
+++ b/src/NewTools-FileBrowser/StFBFileNavigationSystemPresenter.class.st
@@ -52,8 +52,8 @@ notebookPreviewer <SpNoteBook> use by the preview system
 fileReferenceTable <SpTablePresenter> it's display children of the current directory
 "
 Class {
-	#name : #StFBFileNavigationSystemPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StFBFileNavigationSystemPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'currentPathTextInputPresenter',
 		'nameText',
@@ -71,10 +71,12 @@ Class {
 		'LastVisitedDirectory',
 		'Previewer'
 	],
-	#category : #'NewTools-FileBrowser-UI'
+	#category : 'NewTools-FileBrowser-UI',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'UI'
 }
 
-{ #category : #commands }
+{ #category : 'commands' }
 StFBFileNavigationSystemPresenter class >> buildCommandsGroupWith: presenter forRoot: rootCommandGroup [
 	rootCommandGroup
 		register:
@@ -88,12 +90,12 @@ StFBFileNavigationSystemPresenter class >> buildCommandsGroupWith: presenter for
 				yourself)
 ]
 
-{ #category : #defaults }
+{ #category : 'defaults' }
 StFBFileNavigationSystemPresenter class >> defaultDirectory [
 	^ FileLocator imageDirectory
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StFBFileNavigationSystemPresenter class >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
@@ -117,12 +119,12 @@ StFBFileNavigationSystemPresenter class >> defaultLayout [
 		yourself
 ]
 
-{ #category : #defaults }
+{ #category : 'defaults' }
 StFBFileNavigationSystemPresenter class >> defaultPreviewer [
 	^ StFBContentPreviewer new
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBFileNavigationSystemPresenter class >> example [
 	<example>
 	| presenter |
@@ -134,12 +136,12 @@ StFBFileNavigationSystemPresenter class >> example [
 	^ presenter
 ]
 
-{ #category : #'class initialization' }
+{ #category : 'class initialization' }
 StFBFileNavigationSystemPresenter class >> initialize [
 	Previewer := self defaultPreviewer
 ]
 
-{ #category : #defaults }
+{ #category : 'defaults' }
 StFBFileNavigationSystemPresenter class >> lastVisitedDirectory [
 
 	(LastVisitedDirectory isNotNil and: [ 
@@ -150,7 +152,7 @@ StFBFileNavigationSystemPresenter class >> lastVisitedDirectory [
 	^ LastVisitedDirectory
 ]
 
-{ #category : #'api - customization' }
+{ #category : 'api - customization' }
 StFBFileNavigationSystemPresenter >> columns: aCollectionOfColumns [
 	| tmpColumn |
 	tmpColumn := aCollectionOfColumns asSet.
@@ -162,7 +164,7 @@ StFBFileNavigationSystemPresenter >> columns: aCollectionOfColumns [
 		columns: ((tmpColumn asOrderedCollection sort: #priority ascending) collect: #column)
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileNavigationSystemPresenter >> connectPresenters [
 
 	self filesListAction.
@@ -172,12 +174,12 @@ StFBFileNavigationSystemPresenter >> connectPresenters [
 	self nextButtonAction
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 StFBFileNavigationSystemPresenter >> createDirectory [
 	^ self createDirectory: 'new-folder'
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 StFBFileNavigationSystemPresenter >> createDirectory: initialName [
 	| name path |
 	name := (UIManager default
@@ -196,12 +198,12 @@ StFBFileNavigationSystemPresenter >> createDirectory: initialName [
 	self createDirectory: name
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> currentDirectory [ 
 	^ currentDirectory
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> currentDirectory: aFileReference [
 
 	(aFileReference exists and: [ aFileReference isDirectory ]) ifFalse: [ 
@@ -210,28 +212,28 @@ StFBFileNavigationSystemPresenter >> currentDirectory: aFileReference [
 	LastVisitedDirectory := currentDirectory
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> currentPathTextInputPresenter [
 	^ currentPathTextInputPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileNavigationSystemPresenter >> defaultDirectory [
 	^ self class defaultDirectory
 ]
 
-{ #category : #'api - customization' }
+{ #category : 'api - customization' }
 StFBFileNavigationSystemPresenter >> defaultFolder: aFileReference [
 	self updateWidgetWithFileReference: aFileReference.
 	self initializeHistoryIteratorWith: aFileReference
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> fileReferenceTable [
 	^ fileReferenceTable
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StFBFileNavigationSystemPresenter >> filesListAction [
 
 	| previewProcess |
@@ -257,7 +259,7 @@ StFBFileNavigationSystemPresenter >> filesListAction [
 			                  named: 'File Browser preview loader' ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> filter: aFilter [
 
 	filter := aFilter.
@@ -266,7 +268,7 @@ StFBFileNavigationSystemPresenter >> filter: aFilter [
 			self initializeFiltersDropList ] ]
 ]
 
-{ #category : #'api - customization' }
+{ #category : 'api - customization' }
 StFBFileNavigationSystemPresenter >> filtersCustomization: aCollectionOfFilter [
 	"i always add the filter 'no filter'"
 
@@ -281,17 +283,17 @@ StFBFileNavigationSystemPresenter >> filtersCustomization: aCollectionOfFilter [
 				indexOf: StFBAllFilter new name)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> filtersDropList [
 	^ filtersDropList
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StFBFileNavigationSystemPresenter >> filtersDropListAction [
 	filtersDropList whenSelectionChangedDo: [ self updateTableContent ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileNavigationSystemPresenter >> initialize [
 
 	filter := StFBVisibleFilter new.
@@ -299,7 +301,7 @@ StFBFileNavigationSystemPresenter >> initialize [
 	super initialize
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileNavigationSystemPresenter >> initializeFilesTable [
 
 	fileReferenceTable
@@ -312,7 +314,7 @@ StFBFileNavigationSystemPresenter >> initializeFilesTable [
 		contextMenuFromCommandsGroup: [ self rootCommandsGroup / 'Menu' ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileNavigationSystemPresenter >> initializeFiltersDropList [
 
 	filtersDropList
@@ -321,7 +323,7 @@ StFBFileNavigationSystemPresenter >> initializeFiltersDropList [
 		selectItem: filter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileNavigationSystemPresenter >> initializeHistoryIteratorWith: aFolder [
 
 	history := ConfigurableHistoryIterator
@@ -332,7 +334,7 @@ StFBFileNavigationSystemPresenter >> initializeHistoryIteratorWith: aFolder [
 	history register: aFolder
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBFileNavigationSystemPresenter >> initializePresenters [
 
 	notebookPreviewer := self instantiate: StFBNoteBookPreviewerPresenter.
@@ -357,24 +359,24 @@ StFBFileNavigationSystemPresenter >> initializePresenters [
 	self initializeHistoryIteratorWith: currentDirectory
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> lastVisitedDirectory [
 	^ self class lastVisitedDirectory
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> nameText [
 	^ nameText
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StFBFileNavigationSystemPresenter >> nameTextAction [
 
 	nameText whenTextChangedDo: [ :newText | 
 		self nameTextChanged: newText ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StFBFileNavigationSystemPresenter >> nameTextChanged: aText [
 
 	fileReferenceTable selectedItem ifNotNil: [ :item | 
@@ -387,49 +389,49 @@ StFBFileNavigationSystemPresenter >> nameTextChanged: aText [
 		ifNone: [ fileReferenceTable unselectAll ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> nextButton [
 	^ nextButton
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> nextButtonAction [
 	nextButton action: [ history redoIfEmpty: [ self inform: 'Nothing to redo.' ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> notebookPreviewer [
 	^ notebookPreviewer
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 StFBFileNavigationSystemPresenter >> openFolder: aFileReference [
 
 	self updateWidgetWithFileReference: aFileReference.
 	history register: currentDirectory
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> previewer [
 	^ previewer
 ]
 
-{ #category : #'api - customization' }
+{ #category : 'api - customization' }
 StFBFileNavigationSystemPresenter >> previewer: aPreviewer [ 
 	previewer := aPreviewer 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StFBFileNavigationSystemPresenter >> previousBeforeButtonAction [
 	previousButton action: [ history undoIfEmpty: [ self inform: 'Nothing to undo' ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> previousButton [
 	^ previousButton
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBFileNavigationSystemPresenter >> selectedEntry [
 
 	^ fileReferenceTable selection selectedItem ifNil: [ 
@@ -438,7 +440,7 @@ StFBFileNavigationSystemPresenter >> selectedEntry [
 			  ifNotEmpty: [ :text | self currentDirectory / text ] ]
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 StFBFileNavigationSystemPresenter >> updateTableContent [
 
 	fileReferenceTable items:
@@ -446,7 +448,7 @@ StFBFileNavigationSystemPresenter >> updateTableContent [
 			 (currentDirectory children select: #exists))
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 StFBFileNavigationSystemPresenter >> updateWidgetWithFileReference: aFileReference [
 	self currentDirectory: aFileReference.
 	self updateTableContent.
diff --git a/src/NewTools-FileBrowser/StFBGIFFilter.class.st b/src/NewTools-FileBrowser/StFBGIFFilter.class.st
index 33d54436c..b32c752cc 100644
--- a/src/NewTools-FileBrowser/StFBGIFFilter.class.st
+++ b/src/NewTools-FileBrowser/StFBGIFFilter.class.st
@@ -2,17 +2,19 @@
 I am a filter selecting files with a gif extension.
 "
 Class {
-	#name : #StFBGIFFilter,
-	#superclass : #StFBExtensionsFilter,
-	#category : #'NewTools-FileBrowser-Filtering'
+	#name : 'StFBGIFFilter',
+	#superclass : 'StFBExtensionsFilter',
+	#category : 'NewTools-FileBrowser-Filtering',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBGIFFilter >> basename [
 	^ 'GIF'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBGIFFilter >> extensions [
 	^ #('gif')
 ]
diff --git a/src/NewTools-FileBrowser/StFBGroupBookmark.class.st b/src/NewTools-FileBrowser/StFBGroupBookmark.class.st
index cd95039e7..885ed0b4b 100644
--- a/src/NewTools-FileBrowser/StFBGroupBookmark.class.st
+++ b/src/NewTools-FileBrowser/StFBGroupBookmark.class.st
@@ -2,15 +2,17 @@
 i'm use to dispay group of bookmark
 "
 Class {
-	#name : #StFBGroupBookmark,
-	#superclass : #StFBAbstractBookMark,
+	#name : 'StFBGroupBookmark',
+	#superclass : 'StFBAbstractBookMark',
 	#instVars : [
 		'collection'
 	],
-	#category : #'NewTools-FileBrowser-Bookmark'
+	#category : 'NewTools-FileBrowser-Bookmark',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Bookmark'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StFBGroupBookmark class >> name: aName collection: aCollection iconName: icon [
 	^ self new
 		name: aName;
@@ -19,27 +21,27 @@ StFBGroupBookmark class >> name: aName collection: aCollection iconName: icon [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBGroupBookmark >> children [ 
 	^ collection
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBGroupBookmark >> collection [
 	^ collection
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBGroupBookmark >> collection: anObject [
 	collection := anObject
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBGroupBookmark >> isComposite [
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBGroupBookmark >> removeAt: anInteger [ 
 	self collection removeAt: anInteger.
 ]
diff --git a/src/NewTools-FileBrowser/StFBIconColumn.class.st b/src/NewTools-FileBrowser/StFBIconColumn.class.st
index 3c3ba6c69..31642bac3 100644
--- a/src/NewTools-FileBrowser/StFBIconColumn.class.st
+++ b/src/NewTools-FileBrowser/StFBIconColumn.class.st
@@ -2,34 +2,36 @@
 I'm a column use to displayan icon depending on the file to display in the file dialog.
 "
 Class {
-	#name : #StFBIconColumn,
-	#superclass : #StFBAbstractColumn,
-	#category : #'NewTools-FileBrowser-Columns'
+	#name : 'StFBIconColumn',
+	#superclass : 'StFBAbstractColumn',
+	#category : 'NewTools-FileBrowser-Columns',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Columns'
 }
 
-{ #category : #adding }
+{ #category : 'adding' }
 StFBIconColumn class >> addContraintTo: aTableColumn [
 	aTableColumn width: 20
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBIconColumn class >> evaluateOn: aFileReference [
 	"I'm provide action for fileReference"
 
 	^ aFileReference isDirectory ifTrue: [ self iconNamed: #configNew ] ifFalse: [ self iconNamed: #page ]
 ]
 
-{ #category : #sorting }
+{ #category : 'sorting' }
 StFBIconColumn class >> priority [
 	^ 0
 ]
 
-{ #category : #class }
+{ #category : 'class' }
 StFBIconColumn class >> tableColumnClass [
 	^ SpImageTableColumn
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBIconColumn class >> title [
 	^ ''
 ]
diff --git a/src/NewTools-FileBrowser/StFBInspectCommand.class.st b/src/NewTools-FileBrowser/StFBInspectCommand.class.st
index fd424354a..c63e9593a 100644
--- a/src/NewTools-FileBrowser/StFBInspectCommand.class.st
+++ b/src/NewTools-FileBrowser/StFBInspectCommand.class.st
@@ -2,19 +2,21 @@
 I'm a inspect command use to inspect the selectedFile
 "
 Class {
-	#name : #StFBInspectCommand,
-	#superclass : #CmCommand,
-	#category : #'NewTools-FileBrowser-Commands'
+	#name : 'StFBInspectCommand',
+	#superclass : 'CmCommand',
+	#category : 'NewTools-FileBrowser-Commands',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Commands'
 }
 
-{ #category : #converting }
+{ #category : 'converting' }
 StFBInspectCommand >> asSpecCommand [
 	^ super asSpecCommand
 		iconName: #smallInspectIt;
 		yourself
 ]
 
-{ #category : #hooks }
+{ #category : 'hooks' }
 StFBInspectCommand >> execute [
 	"Execute the actions that should be done by the command.
 	 This method expect that the context has been put in #context inst. var. if any context is relevant."
@@ -22,7 +24,7 @@ StFBInspectCommand >> execute [
 	self context selectedEntry inspect
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBInspectCommand >> initialize [
 	super initialize.
 	self
diff --git a/src/NewTools-FileBrowser/StFBInspectPreviewer.class.st b/src/NewTools-FileBrowser/StFBInspectPreviewer.class.st
index 666467671..6ba0d74c2 100644
--- a/src/NewTools-FileBrowser/StFBInspectPreviewer.class.st
+++ b/src/NewTools-FileBrowser/StFBInspectPreviewer.class.st
@@ -2,23 +2,25 @@
 I'm a inspector previewer 
 "
 Class {
-	#name : #StFBInspectPreviewer,
-	#superclass : #StFBAbstractPreviewer,
-	#category : #'NewTools-FileBrowser-Previewers'
+	#name : 'StFBInspectPreviewer',
+	#superclass : 'StFBAbstractPreviewer',
+	#category : 'NewTools-FileBrowser-Previewers',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Previewers'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBInspectPreviewer >> canBeUsedOn: aFileReference [
 	^ true
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBInspectPreviewer >> matchingMimeType: aZnMimeType [
 	"return a Boolean to indicate if element matches"
 	^ true
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBInspectPreviewer >> previewActionOn: aFileReference [
 	^ StInspector instanciateOn: aFileReference
 ]
diff --git a/src/NewTools-FileBrowser/StFBJPEGFilter.class.st b/src/NewTools-FileBrowser/StFBJPEGFilter.class.st
index b0d7eb965..81f92a131 100644
--- a/src/NewTools-FileBrowser/StFBJPEGFilter.class.st
+++ b/src/NewTools-FileBrowser/StFBJPEGFilter.class.st
@@ -2,17 +2,19 @@
 I am a filter selecting files with a jpeg extension.
 "
 Class {
-	#name : #StFBJPEGFilter,
-	#superclass : #StFBExtensionsFilter,
-	#category : #'NewTools-FileBrowser-Filtering'
+	#name : 'StFBJPEGFilter',
+	#superclass : 'StFBExtensionsFilter',
+	#category : 'NewTools-FileBrowser-Filtering',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBJPEGFilter >> basename [
 	^ 'JPEG'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBJPEGFilter >> extensions [
 	^ #('jpg' 'jpeg' 'jpe' 'jfif')
 ]
diff --git a/src/NewTools-FileBrowser/StFBJPGPreviewer.class.st b/src/NewTools-FileBrowser/StFBJPGPreviewer.class.st
index 6db54c354..191cd84fb 100644
--- a/src/NewTools-FileBrowser/StFBJPGPreviewer.class.st
+++ b/src/NewTools-FileBrowser/StFBJPGPreviewer.class.st
@@ -3,18 +3,20 @@ I'm a previewer for JPG , jpeg file
 	I provide a SpImagePresenter to show the picture
 "
 Class {
-	#name : #StFBJPGPreviewer,
-	#superclass : #StFBAbstractPreviewer,
-	#category : #'NewTools-FileBrowser-Previewers'
+	#name : 'StFBJPGPreviewer',
+	#superclass : 'StFBAbstractPreviewer',
+	#category : 'NewTools-FileBrowser-Previewers',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Previewers'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBJPGPreviewer >> matchingMimeType: aZnMimeType [
 
 	^ aZnMimeType matches: ZnMimeType imageJpeg
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 StFBJPGPreviewer >> previewActionOn: aFileReference [
 	^ SpImagePresenter new
 		image:
diff --git a/src/NewTools-FileBrowser/StFBLastOpenDateColumn.class.st b/src/NewTools-FileBrowser/StFBLastOpenDateColumn.class.st
index 9f6c801f7..b2cc33f1a 100644
--- a/src/NewTools-FileBrowser/StFBLastOpenDateColumn.class.st
+++ b/src/NewTools-FileBrowser/StFBLastOpenDateColumn.class.st
@@ -2,27 +2,29 @@
 I'm a column use to display the last access date of a file in a File dialog.
 "
 Class {
-	#name : #StFBLastOpenDateColumn,
-	#superclass : #StFBAbstractColumn,
-	#category : #'NewTools-FileBrowser-Columns'
+	#name : 'StFBLastOpenDateColumn',
+	#superclass : 'StFBAbstractColumn',
+	#category : 'NewTools-FileBrowser-Columns',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Columns'
 }
 
-{ #category : #adding }
+{ #category : 'adding' }
 StFBLastOpenDateColumn class >> addContraintTo: aTableColumn [
 	aTableColumn width: 150
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBLastOpenDateColumn class >> evaluateOn: aFileReference [
 	^ aFileReference accessTime fileDialogFormat
 ]
 
-{ #category : #sorting }
+{ #category : 'sorting' }
 StFBLastOpenDateColumn class >> priority [
 	^ 70
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBLastOpenDateColumn class >> title [
 	^ 'Date Last Opened'
 ]
diff --git a/src/NewTools-FileBrowser/StFBModificationDateColumn.class.st b/src/NewTools-FileBrowser/StFBModificationDateColumn.class.st
index 02ef73d29..ba8987e81 100644
--- a/src/NewTools-FileBrowser/StFBModificationDateColumn.class.st
+++ b/src/NewTools-FileBrowser/StFBModificationDateColumn.class.st
@@ -2,28 +2,30 @@
 I'm a column use to display the modification date of a file in a File dialog.
 "
 Class {
-	#name : #StFBModificationDateColumn,
-	#superclass : #StFBAbstractColumn,
-	#category : #'NewTools-FileBrowser-Columns'
+	#name : 'StFBModificationDateColumn',
+	#superclass : 'StFBAbstractColumn',
+	#category : 'NewTools-FileBrowser-Columns',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Columns'
 }
 
-{ #category : #adding }
+{ #category : 'adding' }
 StFBModificationDateColumn class >> addContraintTo: aTableColumn [
 	aTableColumn width: 150
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBModificationDateColumn class >> evaluateOn: aFileReference [
 
 	^ aFileReference modificationTime fileDialogFormat
 ]
 
-{ #category : #sorting }
+{ #category : 'sorting' }
 StFBModificationDateColumn class >> priority [
 	^ 50
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBModificationDateColumn class >> title [
 	^ 'Date Modified'
 ]
diff --git a/src/NewTools-FileBrowser/StFBMorphicUIManager.class.st b/src/NewTools-FileBrowser/StFBMorphicUIManager.class.st
index 15fa433f8..964ead78c 100644
--- a/src/NewTools-FileBrowser/StFBMorphicUIManager.class.st
+++ b/src/NewTools-FileBrowser/StFBMorphicUIManager.class.st
@@ -4,25 +4,27 @@ I override methods related to opening a file dialog to use my own file dialog in
 To use me by default, see class-side.
 "
 Class {
-	#name : #StFBMorphicUIManager,
-	#superclass : #MorphicUIManager,
-	#category : #'NewTools-FileBrowser-UI'
+	#name : 'StFBMorphicUIManager',
+	#superclass : 'MorphicUIManager',
+	#category : 'NewTools-FileBrowser-UI',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'UI'
 }
 
-{ #category : #public }
+{ #category : 'public' }
 StFBMorphicUIManager class >> beDefault [
 	<script>
 	self new beDefault
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBMorphicUIManager class >> isActiveManager [
 	"This is just a temporary UI manager and it should not be enabled by the system by default."
 
 	^ false
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBMorphicUIManager class >> isValidForCurrentSystemConfiguration [
 
 	"Has to return false, otherwise UIManager will select this one as default automatically when the image is opened"
@@ -30,7 +32,7 @@ StFBMorphicUIManager class >> isValidForCurrentSystemConfiguration [
 	^ false
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StFBMorphicUIManager >> chooseDirectory: label from: dir [
 	self flag: #ToDoWhenIntegration.
 	self flag: 'use chooseDirectory:path: instead of this'.
@@ -40,7 +42,7 @@ StFBMorphicUIManager >> chooseDirectory: label from: dir [
 		open
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StFBMorphicUIManager >> chooseDirectory: label path: path [
 
 	^ StFBOpenDirectoryDialog new
@@ -52,7 +54,7 @@ StFBMorphicUIManager >> chooseDirectory: label path: path [
 		  selectedEntry
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StFBMorphicUIManager >> chooseFileMatching: patterns label: label [
 	self deprecated: 'now you have to give a filter see NewTools-FileBrowser-Filtering'.
 	^ StFBOpenFileDialog new
@@ -61,7 +63,7 @@ StFBMorphicUIManager >> chooseFileMatching: patterns label: label [
 		open
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StFBMorphicUIManager >> chooseFileName: title extensions: exts path: path preview: preview [
 	self
 		deprecated: 'now you have to give a filter see FileDialog-filterStrategie'.
@@ -73,7 +75,7 @@ StFBMorphicUIManager >> chooseFileName: title extensions: exts path: path previe
 		open) ifNotNil: #basename
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StFBMorphicUIManager >> chooseFullFileName: title extensions: exts path: path preview: preview [
 	self
 		deprecated: 'now you have to give a filter see FileDialog-filterStrategie'.
@@ -85,7 +87,7 @@ StFBMorphicUIManager >> chooseFullFileName: title extensions: exts path: path pr
 		open) ifNotNil: #fullName
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StFBMorphicUIManager >> chooseFullFileNameMatching: patterns label: title [
 	self
 		deprecated: 'now you have to give a filter see FileDialog-filterStrategie'.
@@ -96,7 +98,7 @@ StFBMorphicUIManager >> chooseFullFileNameMatching: patterns label: title [
 			open
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StFBMorphicUIManager >> fileOpen: title extensions: exts path: path preview: preview [
 	self
 		deprecated: 'now you have to give a filter see FileDialog-filterStrategie'.
@@ -108,7 +110,7 @@ StFBMorphicUIManager >> fileOpen: title extensions: exts path: path preview: pre
 		openModal) ifNotNil: #readStream
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StFBMorphicUIManager >> fileSave: title extensions: exts path: path [
 	self
 		deprecated: 'now you have to give a filter see FileDialog-filterStrategie'.
diff --git a/src/NewTools-FileBrowser/StFBNameColumn.class.st b/src/NewTools-FileBrowser/StFBNameColumn.class.st
index 0e76511e2..360dabf7f 100644
--- a/src/NewTools-FileBrowser/StFBNameColumn.class.st
+++ b/src/NewTools-FileBrowser/StFBNameColumn.class.st
@@ -4,17 +4,19 @@ I'm use to give you the name of a fileReference.
 For example for the file 'my/path/something.exe' I'll display something.exe.
 "
 Class {
-	#name : #StFBNameColumn,
-	#superclass : #StFBAbstractColumn,
-	#category : #'NewTools-FileBrowser-Columns'
+	#name : 'StFBNameColumn',
+	#superclass : 'StFBAbstractColumn',
+	#category : 'NewTools-FileBrowser-Columns',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Columns'
 }
 
-{ #category : #adding }
+{ #category : 'adding' }
 StFBNameColumn class >> addContraintTo: aTableColumn [
 	"do nothing"
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBNameColumn class >> evaluateOn: aFileReference [
 
 	"I'm provide action for fileReference"
@@ -22,12 +24,12 @@ StFBNameColumn class >> evaluateOn: aFileReference [
 	^ aFileReference basename
 ]
 
-{ #category : #sorting }
+{ #category : 'sorting' }
 StFBNameColumn class >> priority [
 	^ 1
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBNameColumn class >> title [
 	^ 'Name'
 ]
diff --git a/src/NewTools-FileBrowser/StFBNewFolderCommand.class.st b/src/NewTools-FileBrowser/StFBNewFolderCommand.class.st
index 9530f954c..9c328ea0e 100644
--- a/src/NewTools-FileBrowser/StFBNewFolderCommand.class.st
+++ b/src/NewTools-FileBrowser/StFBNewFolderCommand.class.st
@@ -2,26 +2,28 @@
 i'm manage ContextMenu to creat Directory
 "
 Class {
-	#name : #StFBNewFolderCommand,
-	#superclass : #CmCommand,
-	#category : #'NewTools-FileBrowser-Commands'
+	#name : 'StFBNewFolderCommand',
+	#superclass : 'CmCommand',
+	#category : 'NewTools-FileBrowser-Commands',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Commands'
 }
 
-{ #category : #converting }
+{ #category : 'converting' }
 StFBNewFolderCommand >> asSpecCommand [
 	^ super asSpecCommand
 		iconName: #add;
 		yourself
 ]
 
-{ #category : #hooks }
+{ #category : 'hooks' }
 StFBNewFolderCommand >> execute [
 	"Execute the actions that should be done by the command.
 	 This method expect that the context has been put in #context inst. var. if any context is relevant."
 	self context createDirectory
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBNewFolderCommand >> initialize [
 	super initialize.
 	self
diff --git a/src/NewTools-FileBrowser/StFBNoteBookPreviewerPresenter.class.st b/src/NewTools-FileBrowser/StFBNoteBookPreviewerPresenter.class.st
index 52b6de8b4..36ecc3d1a 100644
--- a/src/NewTools-FileBrowser/StFBNoteBookPreviewerPresenter.class.st
+++ b/src/NewTools-FileBrowser/StFBNoteBookPreviewerPresenter.class.st
@@ -2,8 +2,8 @@
 I'm a notebook Presenter use by the previewer system 
 "
 Class {
-	#name : #StFBNoteBookPreviewerPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StFBNoteBookPreviewerPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'notebook',
 		'pageContent',
@@ -12,10 +12,12 @@ Class {
 	#classVars : [
 		'IconCache'
 	],
-	#category : #'NewTools-FileBrowser-UI'
+	#category : 'NewTools-FileBrowser-UI',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'UI'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StFBNoteBookPreviewerPresenter class >> defaultLayout [
 
 	^ SpBoxLayout newLeftToRight	 
@@ -23,7 +25,7 @@ StFBNoteBookPreviewerPresenter class >> defaultLayout [
 		yourself
 ]
 
-{ #category : #'private - icons' }
+{ #category : 'private - icons' }
 StFBNoteBookPreviewerPresenter class >> driveIconContents [
 
 	^'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA/0lEQVQ4je2RPUoDcRDFf7tI
@@ -34,7 +36,7 @@ DucceZ4Tr8VUTitIorO3H8zf4Af4LZ/wICQO43m97AC7MHq7Papn1TndA7h/fh9GTw9B8TZZ
 kd007kzugEASi/XGaH2lWStr4Ft8AlWZooQwDP14AAAAAElFTkSuQmCC'
 ]
 
-{ #category : #'private - icons' }
+{ #category : 'private - icons' }
 StFBNoteBookPreviewerPresenter class >> fileIconContents [
 
 	^'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACjElEQVR42o2SW0hUURSG/32O
@@ -53,7 +55,7 @@ Mk89yCyvFwfvBy1SbF6VLWF7TIRPUdV/FRNNh6qowsDHyaG5l9d2fwfyXD4gAGnljAAAAABJ
 RU5ErkJggg=='
 ]
 
-{ #category : #'private - icons' }
+{ #category : 'private - icons' }
 StFBNoteBookPreviewerPresenter class >> folderIconContents [
 
 	^'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABdElEQVR42mNkoBAwwhhdbT7Z
@@ -66,13 +68,13 @@ cdrkgprMGI1m0myHxEJ4fcNkxikTc2qyY3TJ8AIDQ1h97WRGaysdM011qeh///8w/v8HSmV/
 GP7/+8sA5DOg8EH0fxD/L1z87OW3W+GZieLcSC4AAOV6G9lUA/2gAAAAAElFTkSuQmCC'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBNoteBookPreviewerPresenter class >> iconCache [
 
 	^ IconCache 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBNoteBookPreviewerPresenter class >> iconNamed: aSymbol [
 	"Returns the icon with the given name"
 	
@@ -86,13 +88,13 @@ StFBNoteBookPreviewerPresenter class >> iconNamed: aSymbol [
 				fromBinaryStream: (self perform: selector) base64Decoded readStream ]
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StFBNoteBookPreviewerPresenter class >> open [
 	<script>
 	^ self new openWithSpec; yourself 
 ]
 
-{ #category : #'private - icons' }
+{ #category : 'private - icons' }
 StFBNoteBookPreviewerPresenter class >> terminalIconContents [
 
 	^'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHklEQVR4XmOgGIiKimlo6+iF
@@ -104,7 +106,7 @@ AAUFBaI1YhgAZKwiVfNwM0BFVS3B1z94OxDvIAWbWVgtBBrAywDOEAwMLEDMSiJmYaAGAABP
 FCjDKXmnHQAAAABJRU5ErkJggg=='
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBNoteBookPreviewerPresenter >> initializePage [
 
 	^ SpNotebookPage
@@ -113,7 +115,7 @@ StFBNoteBookPreviewerPresenter >> initializePage [
 		  provider: [ pageContent ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBNoteBookPreviewerPresenter >> initializePresenters [
 
 	notebook := self newNotebook.
@@ -122,12 +124,12 @@ StFBNoteBookPreviewerPresenter >> initializePresenters [
 	notebook addPage: page
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBNoteBookPreviewerPresenter >> pageContent [
 	^ pageContent
 ]
 
-{ #category : #adding }
+{ #category : 'adding' }
 StFBNoteBookPreviewerPresenter >> pageContent: aPresenter [
 
 	pageContent := aPresenter.
diff --git a/src/NewTools-FileBrowser/StFBNullPreviewer.class.st b/src/NewTools-FileBrowser/StFBNullPreviewer.class.st
index ddd0723cc..c6c2f074d 100644
--- a/src/NewTools-FileBrowser/StFBNullPreviewer.class.st
+++ b/src/NewTools-FileBrowser/StFBNullPreviewer.class.st
@@ -2,23 +2,25 @@
 I am a null previewer, I do not show anything
 "
 Class {
-	#name : #StFBNullPreviewer,
-	#superclass : #StFBAbstractPreviewer,
-	#category : #'NewTools-FileBrowser-Previewers'
+	#name : 'StFBNullPreviewer',
+	#superclass : 'StFBAbstractPreviewer',
+	#category : 'NewTools-FileBrowser-Previewers',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Previewers'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBNullPreviewer >> canBeUsedOn: aFileReference [
 	^ true
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBNullPreviewer >> matchingMimeType: aZnMimeType [
 	"return a Boolean to indicate if element matches"
 	^ true
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 StFBNullPreviewer >> previewActionOn: aFileReference [
 
 	^ SpNullPresenter new
diff --git a/src/NewTools-FileBrowser/StFBOpenDirectoryDialog.class.st b/src/NewTools-FileBrowser/StFBOpenDirectoryDialog.class.st
index 2c651bb0c..80b10d55a 100644
--- a/src/NewTools-FileBrowser/StFBOpenDirectoryDialog.class.st
+++ b/src/NewTools-FileBrowser/StFBOpenDirectoryDialog.class.st
@@ -6,37 +6,39 @@ So no files will be shown in the file/folder listings.
 see my super for more information about customization
 "
 Class {
-	#name : #StFBOpenDirectoryDialog,
-	#superclass : #StFBOpenFileOrDirectoryDialog,
-	#category : #'NewTools-FileBrowser-UI'
+	#name : 'StFBOpenDirectoryDialog',
+	#superclass : 'StFBOpenFileOrDirectoryDialog',
+	#category : 'NewTools-FileBrowser-UI',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'UI'
 }
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBOpenDirectoryDialog class >> example [
 
 	<example>
 	^ self chooseThenInspect
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBOpenDirectoryDialog class >> exampleModal [
 
 	<example>
 	^ self chooseModalAndInspect
 ]
 
-{ #category : #hooks }
+{ #category : 'hooks' }
 StFBOpenDirectoryDialog >> allowsChooseDirectoryIfNoFilename [
 
 	^ true
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StFBOpenDirectoryDialog >> initialTitle [
 	^ 'Select Directory To Open'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBOpenDirectoryDialog >> initialize [
 
 	super initialize.
@@ -44,7 +46,7 @@ StFBOpenDirectoryDialog >> initialize [
 	filter ifNil: [ filter := StFBDirectoryFilter new ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StFBOpenDirectoryDialog >> selectedEntry [
 
 	super selectedEntry ifNotNil: [ :fileReference | 
diff --git a/src/NewTools-FileBrowser/StFBOpenFileDialog.class.st b/src/NewTools-FileBrowser/StFBOpenFileDialog.class.st
index 316147b72..03c66860c 100644
--- a/src/NewTools-FileBrowser/StFBOpenFileDialog.class.st
+++ b/src/NewTools-FileBrowser/StFBOpenFileDialog.class.st
@@ -7,12 +7,14 @@ examples see class side method example
 
 "
 Class {
-	#name : #StFBOpenFileDialog,
-	#superclass : #StFBOpenFileOrDirectoryDialog,
-	#category : #'NewTools-FileBrowser-UI'
+	#name : 'StFBOpenFileDialog',
+	#superclass : 'StFBOpenFileOrDirectoryDialog',
+	#category : 'NewTools-FileBrowser-UI',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'UI'
 }
 
-{ #category : #example }
+{ #category : 'example' }
 StFBOpenFileDialog class >> complexExample [
 
 	<example>
@@ -47,28 +49,28 @@ StFBOpenFileDialog class >> complexExample [
 	^ presenter confirm
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBOpenFileDialog class >> example [
 
 	<example>
 	^ self chooseThenInspect
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBOpenFileDialog class >> exampleExtensions [
 
 	<example>
 	^ self extensions: #( 'image' )
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBOpenFileDialog class >> exampleModal [
 
 	<example>
 	^ self chooseModalAndInspect
 ]
 
-{ #category : #example }
+{ #category : 'example' }
 StFBOpenFileDialog class >> examplePreviewer [
 
 	self new
@@ -76,7 +78,7 @@ StFBOpenFileDialog class >> examplePreviewer [
 		open
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StFBOpenFileDialog >> initialTitle [
 	^ 'Select File To Open'
 ]
diff --git a/src/NewTools-FileBrowser/StFBOpenFileOrDirectoryDialog.class.st b/src/NewTools-FileBrowser/StFBOpenFileOrDirectoryDialog.class.st
index 58221abef..7965b5aa6 100644
--- a/src/NewTools-FileBrowser/StFBOpenFileOrDirectoryDialog.class.st
+++ b/src/NewTools-FileBrowser/StFBOpenFileOrDirectoryDialog.class.st
@@ -1,21 +1,23 @@
 Class {
-	#name : #StFBOpenFileOrDirectoryDialog,
-	#superclass : #StFBFileDialogPresenter,
-	#category : #'NewTools-FileBrowser-UI'
+	#name : 'StFBOpenFileOrDirectoryDialog',
+	#superclass : 'StFBFileDialogPresenter',
+	#category : 'NewTools-FileBrowser-UI',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'UI'
 }
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StFBOpenFileOrDirectoryDialog >> confirmLabel [
 
 	^ 'Open'
 ]
 
-{ #category : #hooks }
+{ #category : 'hooks' }
 StFBOpenFileOrDirectoryDialog >> initialTitle [
 	^ self subclassResponsibility
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBOpenFileOrDirectoryDialog >> initializePresenters [
 
 	super initializePresenters.
diff --git a/src/NewTools-FileBrowser/StFBPNGFilter.class.st b/src/NewTools-FileBrowser/StFBPNGFilter.class.st
index 854e5dfcd..cebdb58df 100644
--- a/src/NewTools-FileBrowser/StFBPNGFilter.class.st
+++ b/src/NewTools-FileBrowser/StFBPNGFilter.class.st
@@ -2,17 +2,19 @@
 I am a filter selecting files with a png extension.
 "
 Class {
-	#name : #StFBPNGFilter,
-	#superclass : #StFBExtensionsFilter,
-	#category : #'NewTools-FileBrowser-Filtering'
+	#name : 'StFBPNGFilter',
+	#superclass : 'StFBExtensionsFilter',
+	#category : 'NewTools-FileBrowser-Filtering',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBPNGFilter >> basename [
 	^ 'PNG'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBPNGFilter >> extensions [
 	^ #('png')
 ]
diff --git a/src/NewTools-FileBrowser/StFBPNGPreviewer.class.st b/src/NewTools-FileBrowser/StFBPNGPreviewer.class.st
index dc7408936..a60e6be43 100644
--- a/src/NewTools-FileBrowser/StFBPNGPreviewer.class.st
+++ b/src/NewTools-FileBrowser/StFBPNGPreviewer.class.st
@@ -3,18 +3,20 @@ I'm a previewer for PNG file
 	I provide a SpImagePresenter to show the picture
 "
 Class {
-	#name : #StFBPNGPreviewer,
-	#superclass : #StFBAbstractPreviewer,
-	#category : #'NewTools-FileBrowser-Previewers'
+	#name : 'StFBPNGPreviewer',
+	#superclass : 'StFBAbstractPreviewer',
+	#category : 'NewTools-FileBrowser-Previewers',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Previewers'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StFBPNGPreviewer >> matchingMimeType: element [
 
 	^ element matches: ZnMimeType imagePng
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 StFBPNGPreviewer >> previewActionOn: aFileReference [
 	^ SpImagePresenter new
 		image:
diff --git a/src/NewTools-FileBrowser/StFBPathPresenter.class.st b/src/NewTools-FileBrowser/StFBPathPresenter.class.st
index 08e7d6a90..3ea20da8b 100644
--- a/src/NewTools-FileBrowser/StFBPathPresenter.class.st
+++ b/src/NewTools-FileBrowser/StFBPathPresenter.class.st
@@ -18,21 +18,23 @@ Internal Representation and Key Implementation Points.
 
 "
 Class {
-	#name : #StFBPathPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StFBPathPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'action',
 		'count'
 	],
-	#category : #'NewTools-FileBrowser-UI'
+	#category : 'NewTools-FileBrowser-UI',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'UI'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBPathPresenter >> action: aValuable [
 	action := aValuable
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBPathPresenter >> addLinkTo: aPath [
 
 	^ self addPresenter: (self newLink
@@ -41,7 +43,7 @@ StFBPathPresenter >> addLinkTo: aPath [
 			   yourself)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBPathPresenter >> addPresenter: aPresenter [
 
 	self layout
@@ -51,7 +53,7 @@ StFBPathPresenter >> addPresenter: aPresenter [
 		padding: 0
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBPathPresenter >> addSeparator [
 
 	^ self addPresenter: (self newLabel
@@ -59,7 +61,7 @@ StFBPathPresenter >> addSeparator [
 			   yourself)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBPathPresenter >> file: aFile [
 
 	self initializeLayout.
@@ -68,13 +70,13 @@ StFBPathPresenter >> file: aFile [
 		separatedBy: [ self addSeparator ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBPathPresenter >> initializeLayout [
 
 	^ layout := SpBoxLayout newLeftToRight
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBPathPresenter >> layout [
 
 	^ super layout ifNil: [ self initializeLayout ]
diff --git a/src/NewTools-FileBrowser/StFBRemoveBookmarkCommand.class.st b/src/NewTools-FileBrowser/StFBRemoveBookmarkCommand.class.st
index 1f64a9008..63b29bda6 100644
--- a/src/NewTools-FileBrowser/StFBRemoveBookmarkCommand.class.st
+++ b/src/NewTools-FileBrowser/StFBRemoveBookmarkCommand.class.st
@@ -4,19 +4,21 @@ I'm a command use to remove bookmark
 
 "
 Class {
-	#name : #StFBRemoveBookmarkCommand,
-	#superclass : #CmCommand,
-	#category : #'NewTools-FileBrowser-Commands'
+	#name : 'StFBRemoveBookmarkCommand',
+	#superclass : 'CmCommand',
+	#category : 'NewTools-FileBrowser-Commands',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Commands'
 }
 
-{ #category : #converting }
+{ #category : 'converting' }
 StFBRemoveBookmarkCommand >> asSpecCommand [
 	^ super asSpecCommand
 		iconName: #remotesManagerRemoveRemote;
 		yourself
 ]
 
-{ #category : #hooks }
+{ #category : 'hooks' }
 StFBRemoveBookmarkCommand >> execute [
 	| collection tmpBookmark collectionSize |
 	collection := self context bookmarksTreeTable selection selectedPath.
@@ -27,7 +29,7 @@ StFBRemoveBookmarkCommand >> execute [
 	self context bookmarksTreeTable roots: self context bookmarks 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBRemoveBookmarkCommand >> initialize [
 	super initialize.
 	self
diff --git a/src/NewTools-FileBrowser/StFBRightsColumn.class.st b/src/NewTools-FileBrowser/StFBRightsColumn.class.st
index 99048f7c7..50ccd7e9a 100644
--- a/src/NewTools-FileBrowser/StFBRightsColumn.class.st
+++ b/src/NewTools-FileBrowser/StFBRightsColumn.class.st
@@ -2,29 +2,31 @@
 I'm a column use to give you the access rights of a FileReference
 "
 Class {
-	#name : #StFBRightsColumn,
-	#superclass : #StFBAbstractColumn,
-	#category : #'NewTools-FileBrowser-Columns'
+	#name : 'StFBRightsColumn',
+	#superclass : 'StFBAbstractColumn',
+	#category : 'NewTools-FileBrowser-Columns',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Columns'
 }
 
-{ #category : #adding }
+{ #category : 'adding' }
 StFBRightsColumn class >> addContraintTo: aTableColumn [
 	aTableColumn width: 110
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBRightsColumn class >> evaluateOn: aFileReference [
 	"I'm provide action for fileReference"
 
 	^ aFileReference permissions
 ]
 
-{ #category : #sorting }
+{ #category : 'sorting' }
 StFBRightsColumn class >> priority [
 	^ 100
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBRightsColumn class >> title [
 	^ 'Rights'
 ]
diff --git a/src/NewTools-FileBrowser/StFBSaveFileDialog.class.st b/src/NewTools-FileBrowser/StFBSaveFileDialog.class.st
index b9723caf3..0d3b9285e 100644
--- a/src/NewTools-FileBrowser/StFBSaveFileDialog.class.st
+++ b/src/NewTools-FileBrowser/StFBSaveFileDialog.class.st
@@ -2,42 +2,44 @@
 My responsibility is to provide dialog for SAVING files.
 "
 Class {
-	#name : #StFBSaveFileDialog,
-	#superclass : #StFBFileDialogPresenter,
+	#name : 'StFBSaveFileDialog',
+	#superclass : 'StFBFileDialogPresenter',
 	#instVars : [
 		'confirmedOverwrite'
 	],
-	#category : #'NewTools-FileBrowser-UI'
+	#category : 'NewTools-FileBrowser-UI',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'UI'
 }
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBSaveFileDialog class >> example [
 
 	<example>
 	^ self chooseThenInspect
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBSaveFileDialog class >> exampleExtensions [
 
 	<example>
 	^ self extensions: #( 'image' )
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBSaveFileDialog class >> exampleModal [
 
 	<example>
 	^ self chooseModalAndInspect
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StFBSaveFileDialog >> confirmLabel [
 
 	^ 'Save'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBSaveFileDialog >> connectPresenters [
 
 	| ec |
@@ -48,12 +50,12 @@ StFBSaveFileDialog >> connectPresenters [
 		filterBlock: [ :opt :text | opt beginsWith: text ]
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StFBSaveFileDialog >> initialTitle [
 	^ 'Save As'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBSaveFileDialog >> selectedEntry [
 
 	| entry |
diff --git a/src/NewTools-FileBrowser/StFBSizeColumn.class.st b/src/NewTools-FileBrowser/StFBSizeColumn.class.st
index 770dd8672..e6be286fe 100644
--- a/src/NewTools-FileBrowser/StFBSizeColumn.class.st
+++ b/src/NewTools-FileBrowser/StFBSizeColumn.class.st
@@ -2,29 +2,31 @@
 I'm a column for display the size of the file in human readable format.
 "
 Class {
-	#name : #StFBSizeColumn,
-	#superclass : #StFBAbstractColumn,
-	#category : #'NewTools-FileBrowser-Columns'
+	#name : 'StFBSizeColumn',
+	#superclass : 'StFBAbstractColumn',
+	#category : 'NewTools-FileBrowser-Columns',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Columns'
 }
 
-{ #category : #adding }
+{ #category : 'adding' }
 StFBSizeColumn class >> addContraintTo: aTableColumn [
 	aTableColumn width: 70
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBSizeColumn class >> evaluateOn: aFileReference [
 	^ aFileReference isDirectory
 		ifTrue: [ '--' ]
 		ifFalse: [ aFileReference humanReadableSize ]
 ]
 
-{ #category : #sorting }
+{ #category : 'sorting' }
 StFBSizeColumn class >> priority [
 	^ 90
 ]
 
-{ #category : #templateMethod }
+{ #category : 'templateMethod' }
 StFBSizeColumn class >> title [
 	^ 'Size'
 ]
diff --git a/src/NewTools-FileBrowser/StFBVisibleFilter.class.st b/src/NewTools-FileBrowser/StFBVisibleFilter.class.st
index f7a1d04c3..ca39bb16a 100644
--- a/src/NewTools-FileBrowser/StFBVisibleFilter.class.st
+++ b/src/NewTools-FileBrowser/StFBVisibleFilter.class.st
@@ -2,22 +2,24 @@
 I am a filter that will only select visible files. I will reject all the hidden files of the FileDialog.
 "
 Class {
-	#name : #StFBVisibleFilter,
-	#superclass : #StFBAbstractFilter,
-	#category : #'NewTools-FileBrowser-Filtering'
+	#name : 'StFBVisibleFilter',
+	#superclass : 'StFBAbstractFilter',
+	#category : 'NewTools-FileBrowser-Filtering',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'Filtering'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBVisibleFilter class >> priority [
 	^ 50
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBVisibleFilter >> name [
 	^ 'Without hidden'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBVisibleFilter >> predicate: aFileReference [
 
 	OSPlatform current isWindows ifTrue: [ 
diff --git a/src/NewTools-FileBrowser/StFBWindowPathPresenter.class.st b/src/NewTools-FileBrowser/StFBWindowPathPresenter.class.st
index 3fdf8accf..73e352d7e 100644
--- a/src/NewTools-FileBrowser/StFBWindowPathPresenter.class.st
+++ b/src/NewTools-FileBrowser/StFBWindowPathPresenter.class.st
@@ -19,18 +19,20 @@ UI using this widget have to define openOn: aFileReference
 	
 "
 Class {
-	#name : #StFBWindowPathPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StFBWindowPathPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'textInput',
 		'editButton',
 		'path',
 		'isInEditMode'
 	],
-	#category : #'NewTools-FileBrowser-UI'
+	#category : 'NewTools-FileBrowser-UI',
+	#package : 'NewTools-FileBrowser',
+	#tag : 'UI'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StFBWindowPathPresenter class >> defaultLayout [
 
 	^ SpBoxLayout newLeftToRight
@@ -43,7 +45,7 @@ StFBWindowPathPresenter class >> defaultLayout [
 		  yourself
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StFBWindowPathPresenter class >> editablelayout [
 
 	^ SpBoxLayout newLeftToRight
@@ -55,7 +57,7 @@ StFBWindowPathPresenter class >> editablelayout [
 		  yourself
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StFBWindowPathPresenter class >> example [
 	<example>
 	^ self new
@@ -63,12 +65,12 @@ StFBWindowPathPresenter class >> example [
 		openWithSpec
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBWindowPathPresenter >> currentDirectory [
 	^ self owner ifNotNil: #currentDirectory
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StFBWindowPathPresenter >> currentDirectory: aFileReference [
 
 	textInput text: aFileReference fullName.
@@ -79,12 +81,12 @@ StFBWindowPathPresenter >> currentDirectory: aFileReference [
 	self build
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBWindowPathPresenter >> entityText [
 	^ textInput
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFBWindowPathPresenter >> initializePresenters [
 
 	textInput := self newTextInput.
@@ -111,12 +113,12 @@ StFBWindowPathPresenter >> initializePresenters [
 			isInEditMode := isInEditMode not ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFBWindowPathPresenter >> path [
 	^ path
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 StFBWindowPathPresenter >> pathTextChangedTo: aStringOrText [
 
 	| fileReference |
diff --git a/src/NewTools-FileBrowser/StInspector.extension.st b/src/NewTools-FileBrowser/StInspector.extension.st
index 33ba4d739..4752e509b 100644
--- a/src/NewTools-FileBrowser/StInspector.extension.st
+++ b/src/NewTools-FileBrowser/StInspector.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #StInspector }
+Extension { #name : 'StInspector' }
 
-{ #category : #'*NewTools-FileBrowser' }
+{ #category : '*NewTools-FileBrowser' }
 StInspector class >> instanciateOn: anObject [
 	^ self on: (StInspectorModel on: anObject)
 ]
diff --git a/src/NewTools-FileBrowser/package.st b/src/NewTools-FileBrowser/package.st
index 7038bd6f3..7d813fe93 100644
--- a/src/NewTools-FileBrowser/package.st
+++ b/src/NewTools-FileBrowser/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-FileBrowser' }
+Package { #name : 'NewTools-FileBrowser' }
diff --git a/src/NewTools-FlagBrowser-Tests/FBByClassesPagePresenterTest.class.st b/src/NewTools-FlagBrowser-Tests/FBByClassesPagePresenterTest.class.st
index ef87de477..c95d5e093 100644
--- a/src/NewTools-FlagBrowser-Tests/FBByClassesPagePresenterTest.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBByClassesPagePresenterTest.class.st
@@ -1,20 +1,22 @@
 Class {
-	#name : #FBByClassesPagePresenterTest,
-	#superclass : #FBByScopePagePresenterTest,
-	#category : #'NewTools-FlagBrowser-Tests-Presenters'
+	#name : 'FBByClassesPagePresenterTest',
+	#superclass : 'FBByScopePagePresenterTest',
+	#category : 'NewTools-FlagBrowser-Tests-Presenters',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Presenters'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBByClassesPagePresenterTest >> assertionSubClassResponsability [
 	self assert: (flagPage locationsTable items collect: #selector) equals: { #flaged } asOrderedCollection
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 FBByClassesPagePresenterTest >> instanciateFlagPage [
 	^ FBByClassesPagePresenter new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBByClassesPagePresenterTest >> itemToTest [
 	^ UseByFlagbrowserTest
 ]
diff --git a/src/NewTools-FlagBrowser-Tests/FBByFlagsPagePresenterTest.class.st b/src/NewTools-FlagBrowser-Tests/FBByFlagsPagePresenterTest.class.st
index 96b5d8c19..2d32548bb 100644
--- a/src/NewTools-FlagBrowser-Tests/FBByFlagsPagePresenterTest.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBByFlagsPagePresenterTest.class.st
@@ -2,17 +2,19 @@
 A FBByFlagsPagePresenterTest is a test class for testing the behavior of FBByFlagsPagePresenter
 "
 Class {
-	#name : #FBByFlagsPagePresenterTest,
-	#superclass : #FBFlagPresentationPresenterTest,
-	#category : #'NewTools-FlagBrowser-Tests-Presenters'
+	#name : 'FBByFlagsPagePresenterTest',
+	#superclass : 'FBFlagPresentationPresenterTest',
+	#category : 'NewTools-FlagBrowser-Tests-Presenters',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Presenters'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 FBByFlagsPagePresenterTest >> instanciateFlagPage [
 	^ FBByFlagsPagePresenter new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBByFlagsPagePresenterTest >> selectFlagaRandomFalgForTest [
 	flagPage flagsList
 		selectIndex:
@@ -20,7 +22,7 @@ FBByFlagsPagePresenterTest >> selectFlagaRandomFalgForTest [
 				indexOf: #aRandomFlagForTest)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBByFlagsPagePresenterTest >> testWhenCaseSensitiveChangeShouldDisplayTODOAndtodo [
 	"caseSensitive when use to merge capitalized and not capitalized charracter"
 
@@ -42,7 +44,7 @@ FBByFlagsPagePresenterTest >> testWhenCaseSensitiveChangeShouldDisplayTODOAndtod
 						and: [ (flagListItem includes: #Test) not ] ])
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBByFlagsPagePresenterTest >> testWhenFlagsListSelectedItemChangeShouldSendToLocationsTableLocationsOfSelectedItemAndSelectedIndexEquals1 [
 	self selectFlagaRandomFalgForTest.
 	self
@@ -53,7 +55,7 @@ FBByFlagsPagePresenterTest >> testWhenFlagsListSelectedItemChangeShouldSendToLoc
 		equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBByFlagsPagePresenterTest >> testWhenModeDropboxSelectedItemChangeShouldSendToFlagsListAllFlagsOfSelectedItem [
 	flagPage modeDropbox
 		selectedIndex:
diff --git a/src/NewTools-FlagBrowser-Tests/FBByPackagesPagePresenterTest.class.st b/src/NewTools-FlagBrowser-Tests/FBByPackagesPagePresenterTest.class.st
index 988cc77b4..bd2fbd5de 100644
--- a/src/NewTools-FlagBrowser-Tests/FBByPackagesPagePresenterTest.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBByPackagesPagePresenterTest.class.st
@@ -1,20 +1,22 @@
 Class {
-	#name : #FBByPackagesPagePresenterTest,
-	#superclass : #FBByScopePagePresenterTest,
-	#category : #'NewTools-FlagBrowser-Tests-Presenters'
+	#name : 'FBByPackagesPagePresenterTest',
+	#superclass : 'FBByScopePagePresenterTest',
+	#category : 'NewTools-FlagBrowser-Tests-Presenters',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Presenters'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBByPackagesPagePresenterTest >> assertionSubClassResponsability [
 	self assert: (flagPage locationsTable items collect: #selector) equals: { 'methodTaged' . 'flaged' } asOrderedCollection 
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 FBByPackagesPagePresenterTest >> instanciateFlagPage [
 	^ FBByPackagesPagePresenter new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBByPackagesPagePresenterTest >> itemToTest [
 	^ 'NewTools-FlagBrowser-extraUseForTest' asPackage 
 ]
diff --git a/src/NewTools-FlagBrowser-Tests/FBByScopePagePresenterTest.class.st b/src/NewTools-FlagBrowser-Tests/FBByScopePagePresenterTest.class.st
index cfa6eeec9..a40198490 100644
--- a/src/NewTools-FlagBrowser-Tests/FBByScopePagePresenterTest.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBByScopePagePresenterTest.class.st
@@ -1,25 +1,27 @@
 Class {
-	#name : #FBByScopePagePresenterTest,
-	#superclass : #FBFlagPresentationPresenterTest,
-	#category : #'NewTools-FlagBrowser-Tests-Presenters'
+	#name : 'FBByScopePagePresenterTest',
+	#superclass : 'FBFlagPresentationPresenterTest',
+	#category : 'NewTools-FlagBrowser-Tests-Presenters',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Presenters'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 FBByScopePagePresenterTest class >> isAbstract [
 	^ self = FBByScopePagePresenterTest 
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBByScopePagePresenterTest >> assertionSubClassResponsability [
 	^ self subclassResponsibility
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBByScopePagePresenterTest >> itemToTest [
 	^ self subclassResponsibility.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBByScopePagePresenterTest >> testWhenScopeChangeShouldTransmitLocationTable [
 	flagPage scopesList selectIndex: (flagPage scopesList items  indexOf: self itemToTest  ).
 	self assertionSubClassResponsability.
diff --git a/src/NewTools-FlagBrowser-Tests/FBClassMock.class.st b/src/NewTools-FlagBrowser-Tests/FBClassMock.class.st
index 5c0d752cf..9700aabc0 100644
--- a/src/NewTools-FlagBrowser-Tests/FBClassMock.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBClassMock.class.st
@@ -1,23 +1,25 @@
 Class {
-	#name : #FBClassMock,
-	#superclass : #Object,
+	#name : 'FBClassMock',
+	#superclass : 'Object',
 	#instVars : [
 		'isCompileCall'
 	],
-	#category : #'NewTools-FlagBrowser-Tests-Presenters'
+	#category : 'NewTools-FlagBrowser-Tests-Presenters',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Presenters'
 }
 
-{ #category : #compiling }
+{ #category : 'compiling' }
 FBClassMock >> compile: test [
 	isCompileCall := true
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBClassMock >> initialize [
 	isCompileCall := true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBClassMock >> isCompileCall [
 	^ isCompileCall 
 ]
diff --git a/src/NewTools-FlagBrowser-Tests/FBFlagPresentationPresenterTest.class.st b/src/NewTools-FlagBrowser-Tests/FBFlagPresentationPresenterTest.class.st
index 37fac6b98..4e5751751 100644
--- a/src/NewTools-FlagBrowser-Tests/FBFlagPresentationPresenterTest.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBFlagPresentationPresenterTest.class.st
@@ -2,35 +2,37 @@
 A FBFlagPresentationPresenterTest is a test class for testing the behavior of FBFlagPresentationPresenter
 "
 Class {
-	#name : #FBFlagPresentationPresenterTest,
-	#superclass : #TestCase,
+	#name : 'FBFlagPresentationPresenterTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'flagPage'
 	],
-	#category : #'NewTools-FlagBrowser-Tests-Presenters'
+	#category : 'NewTools-FlagBrowser-Tests-Presenters',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Presenters'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 FBFlagPresentationPresenterTest class >> isAbstract [
 	^ self = FBFlagPresentationPresenterTest
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 FBFlagPresentationPresenterTest >> getLocationFlagMethod [
 	^ FBLocation class: FBMock selector: #flagMethod interval: (1 to: 5)
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 FBFlagPresentationPresenterTest >> getLocationFlagMethod2 [
 	^ FBLocation class: FBMock selector: #flagMethod2 interval: (5 to: 7)
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 FBFlagPresentationPresenterTest >> instanciateFlagPage [
 	^ self subclassResponsibility
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 FBFlagPresentationPresenterTest >> setUp [
 	"Hooks that subclasses may override to define the fixture of test."
 
@@ -41,7 +43,7 @@ FBFlagPresentationPresenterTest >> setUp [
 			self getLocationFlagMethod2}
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBFlagPresentationPresenterTest >> testWhenDoubleClickOnLocationsTableShouldCallOpenInBrowserMethod [
 	| mock |
 	mock := FBMockUseToTestDoubleClickAction new.
@@ -50,7 +52,7 @@ FBFlagPresentationPresenterTest >> testWhenDoubleClickOnLocationsTableShouldCall
 	self assert: mock isOpenInBrowserCall
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBFlagPresentationPresenterTest >> testWhenSelectedItemChangedShouldCodeContainsSourceCode [
 	flagPage locationsTable selectIndex: 2.
 	self
@@ -61,7 +63,7 @@ FBFlagPresentationPresenterTest >> testWhenSelectedItemChangedShouldCodeContains
 		equals: flagPage locationsTable selection selectedItem classLocation
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBFlagPresentationPresenterTest >> testWhenTextIsAcceptedShouldCompileIt [
 	| mock |
 	mock := FBClassMock new.
diff --git a/src/NewTools-FlagBrowser-Tests/FBFlagTest.class.st b/src/NewTools-FlagBrowser-Tests/FBFlagTest.class.st
index 959a4b3f8..c1d3de951 100644
--- a/src/NewTools-FlagBrowser-Tests/FBFlagTest.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBFlagTest.class.st
@@ -2,45 +2,47 @@
 A FBFlagTest is a test class for testing the behavior of FBFlag
 "
 Class {
-	#name : #FBFlagTest,
-	#superclass : #TestCase,
+	#name : 'FBFlagTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'flag'
 	],
-	#category : #'NewTools-FlagBrowser-Tests-Base'
+	#category : 'NewTools-FlagBrowser-Tests-Base',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Base'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 FBFlagTest class >> isAbstract [
 	^ self = FBFlagTest
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 FBFlagTest class >> shouldInheritSelectors [
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlagTest >> actualClass [
 	^ self subclassResponsibility
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 FBFlagTest >> defaultParameter [
 	^ self subclassResponsibility
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 FBFlagTest >> insensitiveParameter [
 	^ self subclassResponsibility
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 FBFlagTest >> randomLocation [
 	^ FBLocation class: self class selector: #randomLocation interval: (18 to: 90)
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 FBFlagTest >> setUp [
 	super setUp.
 	flag := self actualClass new.
@@ -48,19 +50,19 @@ FBFlagTest >> setUp [
 	flag locations: {self randomLocation} asOrderedCollection
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBFlagTest >> testAddLocations [
 	self assert: flag locations size equals: 1.
 	flag addLocations: {(FBLocation class: self class selector: #testAddLocations interval: (18 to: 90))}.
 	self assert: flag locations size equals: 2
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBFlagTest >> testFlagClassFor [
 	self assert: (FBFlag flagClassFor: self defaultParameter) equals: self actualClass
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBFlagTest >> testInsensitiveParameter [
 	self assert: flag parameter equals: self defaultParameter.
 	flag insensitiveParameter.
diff --git a/src/NewTools-FlagBrowser-Tests/FBLocationTest.class.st b/src/NewTools-FlagBrowser-Tests/FBLocationTest.class.st
index 1ecb66add..1219fa0de 100644
--- a/src/NewTools-FlagBrowser-Tests/FBLocationTest.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBLocationTest.class.st
@@ -2,27 +2,29 @@
 A FBLocationTest is a test class for testing the behavior of FBLocation
 "
 Class {
-	#name : #FBLocationTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-FlagBrowser-Tests-Base'
+	#name : 'FBLocationTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-FlagBrowser-Tests-Base',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Base'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 FBLocationTest >> defaultLocation [
 	^ FBLocation class: self class selector: #defaultLocation interval: (18 to: 90)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBLocationTest >> testCompiledMethod [
 	self assert: self defaultLocation compiledMethod equals: self class >> #defaultLocation
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBLocationTest >> testPackage [
 	self assert: self defaultLocation package equals: self class package
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FBLocationTest >> testSourceCode [
 	self
 		assert: self defaultLocation sourceCode
diff --git a/src/NewTools-FlagBrowser-Tests/FBMock.class.st b/src/NewTools-FlagBrowser-Tests/FBMock.class.st
index c44bb60b3..33c46f19f 100644
--- a/src/NewTools-FlagBrowser-Tests/FBMock.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBMock.class.st
@@ -5,38 +5,40 @@ Description
 I am a mock used by FlagBrowser tests.
 "
 Class {
-	#name : #FBMock,
-	#superclass : #Object,
-	#category : #'NewTools-FlagBrowser-Tests-Mocks'
+	#name : 'FBMock',
+	#superclass : 'Object',
+	#category : 'NewTools-FlagBrowser-Tests-Mocks',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Mocks'
 }
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 FBMock >> = anObject [
 	self == anObject ifTrue: [ ^ true ].
 	^ self class = anObject class
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 FBMock >> flagMethod [
 	self flag: #aRandomFlagForTest
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 FBMock >> flagMethod2 [
 	self flag: #aRandomFlagForTest
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBMock >> flagStringMethod [
 	self flag: 'a flag for Test flagBrowser'
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBMock >> tagCapitalized [
 	self flag: #TEST
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBMock >> tagNotCapitalized [
 	self flag: #test
 ]
diff --git a/src/NewTools-FlagBrowser-Tests/FBMockFlagsListItems.class.st b/src/NewTools-FlagBrowser-Tests/FBMockFlagsListItems.class.st
index 588611e0c..87fcb9b38 100644
--- a/src/NewTools-FlagBrowser-Tests/FBMockFlagsListItems.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBMockFlagsListItems.class.st
@@ -1,28 +1,30 @@
 Class {
-	#name : #FBMockFlagsListItems,
-	#superclass : #Object,
+	#name : 'FBMockFlagsListItems',
+	#superclass : 'Object',
 	#instVars : [
 		'title'
 	],
-	#category : #'NewTools-FlagBrowser-Tests-Presenters'
+	#category : 'NewTools-FlagBrowser-Tests-Presenters',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Presenters'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBMockFlagsListItems class >> title: aString [ 
 	^ self new title: aString 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBMockFlagsListItems >> locations [ 
 	^ title
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBMockFlagsListItems >> parameter [
 	^ title
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBMockFlagsListItems >> title: aString [
 	title := aString
 ]
diff --git a/src/NewTools-FlagBrowser-Tests/FBMockUseToTestDoubleClickAction.class.st b/src/NewTools-FlagBrowser-Tests/FBMockUseToTestDoubleClickAction.class.st
index a9abc4e7a..d047fe845 100644
--- a/src/NewTools-FlagBrowser-Tests/FBMockUseToTestDoubleClickAction.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBMockUseToTestDoubleClickAction.class.st
@@ -1,38 +1,40 @@
 Class {
-	#name : #FBMockUseToTestDoubleClickAction,
-	#superclass : #Object,
+	#name : 'FBMockUseToTestDoubleClickAction',
+	#superclass : 'Object',
 	#instVars : [
 		'isOpenInBrowserCall'
 	],
-	#category : #'NewTools-FlagBrowser-Tests-Presenters'
+	#category : 'NewTools-FlagBrowser-Tests-Presenters',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Presenters'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBMockUseToTestDoubleClickAction >> classLocation [
 	^ 'test'.
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBMockUseToTestDoubleClickAction >> initialize [
 	isOpenInBrowserCall := false
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBMockUseToTestDoubleClickAction >> interval [
 	^ 1 to: 5
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBMockUseToTestDoubleClickAction >> isOpenInBrowserCall [
 	^ isOpenInBrowserCall
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBMockUseToTestDoubleClickAction >> openInBrowser [
 	isOpenInBrowserCall := true
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBMockUseToTestDoubleClickAction >> sourceCode [
 	^ 'test'
 ]
diff --git a/src/NewTools-FlagBrowser-Tests/FBObjectFlagTest.class.st b/src/NewTools-FlagBrowser-Tests/FBObjectFlagTest.class.st
index 32e805408..ca6dc24f7 100644
--- a/src/NewTools-FlagBrowser-Tests/FBObjectFlagTest.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBObjectFlagTest.class.st
@@ -2,22 +2,24 @@
 A FBObjectFlagTest is a test class for testing the behavior of FBObjectFlag
 "
 Class {
-	#name : #FBObjectFlagTest,
-	#superclass : #FBFlagTest,
-	#category : #'NewTools-FlagBrowser-Tests-Base'
+	#name : 'FBObjectFlagTest',
+	#superclass : 'FBFlagTest',
+	#category : 'NewTools-FlagBrowser-Tests-Base',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Base'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBObjectFlagTest >> actualClass [
 	^ FBObjectFlag
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 FBObjectFlagTest >> defaultParameter [
 	^ FBMock new
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 FBObjectFlagTest >> insensitiveParameter [
 	^ self defaultParameter
 ]
diff --git a/src/NewTools-FlagBrowser-Tests/FBStringFlagTest.class.st b/src/NewTools-FlagBrowser-Tests/FBStringFlagTest.class.st
index a12d44439..a82c6f2fe 100644
--- a/src/NewTools-FlagBrowser-Tests/FBStringFlagTest.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBStringFlagTest.class.st
@@ -2,22 +2,24 @@
 A FBStringFlagTest is a test class for testing the behavior of FBStringFlag
 "
 Class {
-	#name : #FBStringFlagTest,
-	#superclass : #FBFlagTest,
-	#category : #'NewTools-FlagBrowser-Tests-Base'
+	#name : 'FBStringFlagTest',
+	#superclass : 'FBFlagTest',
+	#category : 'NewTools-FlagBrowser-Tests-Base',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Base'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBStringFlagTest >> actualClass [
 	^ FBStringFlag
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 FBStringFlagTest >> defaultParameter [
 	^ 'test'
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 FBStringFlagTest >> insensitiveParameter [
 	^ 'Test'
 ]
diff --git a/src/NewTools-FlagBrowser-Tests/FBSymbolFlagTest.class.st b/src/NewTools-FlagBrowser-Tests/FBSymbolFlagTest.class.st
index af5f1246b..4f86b5133 100644
--- a/src/NewTools-FlagBrowser-Tests/FBSymbolFlagTest.class.st
+++ b/src/NewTools-FlagBrowser-Tests/FBSymbolFlagTest.class.st
@@ -2,22 +2,24 @@
 A FBSymbolFlagTest is a test class for testing the behavior of FBSymbolFlag
 "
 Class {
-	#name : #FBSymbolFlagTest,
-	#superclass : #FBFlagTest,
-	#category : #'NewTools-FlagBrowser-Tests-Base'
+	#name : 'FBSymbolFlagTest',
+	#superclass : 'FBFlagTest',
+	#category : 'NewTools-FlagBrowser-Tests-Base',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Base'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBSymbolFlagTest >> actualClass [
 	^ FBSymbolFlag
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 FBSymbolFlagTest >> defaultParameter [
 	^ #test
 ]
 
-{ #category : #helpers }
+{ #category : 'helpers' }
 FBSymbolFlagTest >> insensitiveParameter [
 	^ #Test
 ]
diff --git a/src/NewTools-FlagBrowser-Tests/ManifestNewToolsFlagBrowserTests.class.st b/src/NewTools-FlagBrowser-Tests/ManifestNewToolsFlagBrowserTests.class.st
index 60ba0f5c3..68587957f 100644
--- a/src/NewTools-FlagBrowser-Tests/ManifestNewToolsFlagBrowserTests.class.st
+++ b/src/NewTools-FlagBrowser-Tests/ManifestNewToolsFlagBrowserTests.class.st
@@ -2,7 +2,9 @@
 I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser
 "
 Class {
-	#name : #ManifestNewToolsFlagBrowserTests,
-	#superclass : #PackageManifest,
-	#category : #'NewTools-FlagBrowser-Tests-Manifest'
+	#name : 'ManifestNewToolsFlagBrowserTests',
+	#superclass : 'PackageManifest',
+	#category : 'NewTools-FlagBrowser-Tests-Manifest',
+	#package : 'NewTools-FlagBrowser-Tests',
+	#tag : 'Manifest'
 }
diff --git a/src/NewTools-FlagBrowser-Tests/package.st b/src/NewTools-FlagBrowser-Tests/package.st
index 97c81c1c0..003b02586 100644
--- a/src/NewTools-FlagBrowser-Tests/package.st
+++ b/src/NewTools-FlagBrowser-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-FlagBrowser-Tests' }
+Package { #name : 'NewTools-FlagBrowser-Tests' }
diff --git a/src/NewTools-FlagBrowser/FBByClassesPagePresenter.class.st b/src/NewTools-FlagBrowser/FBByClassesPagePresenter.class.st
index 2204aa768..4f23c0f29 100644
--- a/src/NewTools-FlagBrowser/FBByClassesPagePresenter.class.st
+++ b/src/NewTools-FlagBrowser/FBByClassesPagePresenter.class.st
@@ -5,27 +5,29 @@ Description
 I am a presenter showing the flags in classes.
 "
 Class {
-	#name : #FBByClassesPagePresenter,
-	#superclass : #FBByScopePagePresenter,
-	#category : #'NewTools-FlagBrowser-Presenters'
+	#name : 'FBByClassesPagePresenter',
+	#superclass : 'FBByScopePagePresenter',
+	#category : 'NewTools-FlagBrowser-Presenters',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Presenters'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBByClassesPagePresenter class >> icon [
 	^ #class
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBByClassesPagePresenter class >> priority [
 	^ 10
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBByClassesPagePresenter class >> title [
 	^ 'By class'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBByClassesPagePresenter >> initializeWidgets [
 	super initializeWidgets.
 
@@ -34,7 +36,7 @@ FBByClassesPagePresenter >> initializeWidgets [
 		addColumn: (SpStringTableColumn title: 'Flag parameter' evaluated: [ :location | location owner parameter ])
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBByClassesPagePresenter >> scopeSelector [
 	^ #classLocation
 ]
diff --git a/src/NewTools-FlagBrowser/FBByFlagsPagePresenter.class.st b/src/NewTools-FlagBrowser/FBByFlagsPagePresenter.class.st
index 72fa7f2ee..90ef447c9 100644
--- a/src/NewTools-FlagBrowser/FBByFlagsPagePresenter.class.st
+++ b/src/NewTools-FlagBrowser/FBByFlagsPagePresenter.class.st
@@ -17,17 +17,19 @@ Internal Representation and Key Implementation Points.
 
 "
 Class {
-	#name : #FBByFlagsPagePresenter,
-	#superclass : #FBFlagPresentationPresenter,
+	#name : 'FBByFlagsPagePresenter',
+	#superclass : 'FBFlagPresentationPresenter',
 	#instVars : [
 		'modeDropbox',
 		'flagsList',
 		'caseCheckbox'
 	],
-	#category : #'NewTools-FlagBrowser-Presenters'
+	#category : 'NewTools-FlagBrowser-Presenters',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Presenters'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBByFlagsPagePresenter class >> defaultSpec [
 	^ SpBoxLayout newVertical
 		add: #modeDropbox withConstraints: [ :constraints | constraints height: 30 ];
@@ -45,37 +47,37 @@ FBByFlagsPagePresenter class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBByFlagsPagePresenter class >> icon [
 	^ #breakpoint
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBByFlagsPagePresenter class >> priority [
 	^ 1
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBByFlagsPagePresenter class >> title [
 	^ 'By flag'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBByFlagsPagePresenter >> caseCheckbox [
 	^ caseCheckbox
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBByFlagsPagePresenter >> flagsList [
 	^ flagsList
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBByFlagsPagePresenter >> flagsList: anObject [
 	flagsList := anObject
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBByFlagsPagePresenter >> initializePresenter [
 	super initializePresenter.
 	flagsList
@@ -93,7 +95,7 @@ FBByFlagsPagePresenter >> initializePresenter [
 			modeDropbox selectedItem: modeDropbox selectedItem	"Used to refresh the list" ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBByFlagsPagePresenter >> initializeWidgets [
 	super initializeWidgets.
 	modeDropbox := self newDropList.
@@ -115,12 +117,12 @@ FBByFlagsPagePresenter >> initializeWidgets [
 		state: FBFlag caseSensitive
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBByFlagsPagePresenter >> modeDropbox [
 	^ modeDropbox
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBByFlagsPagePresenter >> modeDropbox: anObject [
 	modeDropbox := anObject
 ]
diff --git a/src/NewTools-FlagBrowser/FBByPackagesPagePresenter.class.st b/src/NewTools-FlagBrowser/FBByPackagesPagePresenter.class.st
index 0417791aa..a8637367f 100644
--- a/src/NewTools-FlagBrowser/FBByPackagesPagePresenter.class.st
+++ b/src/NewTools-FlagBrowser/FBByPackagesPagePresenter.class.st
@@ -5,27 +5,29 @@ Description
 I am a presenter showing the flags in packages.
 "
 Class {
-	#name : #FBByPackagesPagePresenter,
-	#superclass : #FBByScopePagePresenter,
-	#category : #'NewTools-FlagBrowser-Presenters'
+	#name : 'FBByPackagesPagePresenter',
+	#superclass : 'FBByScopePagePresenter',
+	#category : 'NewTools-FlagBrowser-Presenters',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Presenters'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBByPackagesPagePresenter class >> icon [
 	^ #package
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBByPackagesPagePresenter class >> priority [
 	^ 5
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBByPackagesPagePresenter class >> title [
 	^ 'By package'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBByPackagesPagePresenter >> initializeWidgets [
 	super initializeWidgets.
 
@@ -35,7 +37,7 @@ FBByPackagesPagePresenter >> initializeWidgets [
 		addColumn: (SpStringTableColumn title: 'Flag parameter' evaluated: [ :location | location owner parameter ])
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBByPackagesPagePresenter >> scopeSelector [
 	^ #package
 ]
diff --git a/src/NewTools-FlagBrowser/FBByScopePagePresenter.class.st b/src/NewTools-FlagBrowser/FBByScopePagePresenter.class.st
index e7bf070cc..0cc27ccc0 100644
--- a/src/NewTools-FlagBrowser/FBByScopePagePresenter.class.st
+++ b/src/NewTools-FlagBrowser/FBByScopePagePresenter.class.st
@@ -12,15 +12,17 @@ Internal Representation and Key Implementation Points.
 
 "
 Class {
-	#name : #FBByScopePagePresenter,
-	#superclass : #FBFlagPresentationPresenter,
+	#name : 'FBByScopePagePresenter',
+	#superclass : 'FBFlagPresentationPresenter',
 	#instVars : [
 		'scopesList'
 	],
-	#category : #'NewTools-FlagBrowser-Presenters'
+	#category : 'NewTools-FlagBrowser-Presenters',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Presenters'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBByScopePagePresenter class >> defaultSpec [
 	^ SpPanedLayout newHorizontal
 		position: 250;
@@ -33,12 +35,12 @@ FBByScopePagePresenter class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 FBByScopePagePresenter class >> isAbstract [
 	^ self = FBByScopePagePresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBByScopePagePresenter >> initializePresenter [
 	| locationsByScope |
 	super initializePresenter.
@@ -51,7 +53,7 @@ FBByScopePagePresenter >> initializePresenter [
 		selectIndex: 1
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBByScopePagePresenter >> initializeWidgets [
 	super initializeWidgets.
 	scopesList := self newList.
@@ -60,12 +62,12 @@ FBByScopePagePresenter >> initializeWidgets [
 		sortingBlock: #name ascending
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBByScopePagePresenter >> scopeSelector [
 	^ self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBByScopePagePresenter >> scopesList [
 	^ scopesList
 ]
diff --git a/src/NewTools-FlagBrowser/FBDescriptionPresenter.class.st b/src/NewTools-FlagBrowser/FBDescriptionPresenter.class.st
index a91ed5abc..3b86c3b73 100644
--- a/src/NewTools-FlagBrowser/FBDescriptionPresenter.class.st
+++ b/src/NewTools-FlagBrowser/FBDescriptionPresenter.class.st
@@ -12,37 +12,39 @@ Internal Representation and Key Implementation Points.
 
 "
 Class {
-	#name : #FBDescriptionPresenter,
-	#superclass : #FBPagePresenter,
+	#name : 'FBDescriptionPresenter',
+	#superclass : 'FBPagePresenter',
 	#instVars : [
 		'description'
 	],
-	#category : #'NewTools-FlagBrowser-Presenters'
+	#category : 'NewTools-FlagBrowser-Presenters',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Presenters'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBDescriptionPresenter class >> defaultSpec [
 	^ SpBoxLayout newVertical
 		add: #description;
 		yourself
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBDescriptionPresenter class >> icon [
 	^ #help
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBDescriptionPresenter class >> priority [
 	^ 20
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBDescriptionPresenter class >> title [
 	^ 'Description'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBDescriptionPresenter >> initializeWidgets [
 	description := self newText.
 
diff --git a/src/NewTools-FlagBrowser/FBFlag.class.st b/src/NewTools-FlagBrowser/FBFlag.class.st
index 4ae331301..6264ef5a0 100644
--- a/src/NewTools-FlagBrowser/FBFlag.class.st
+++ b/src/NewTools-FlagBrowser/FBFlag.class.st
@@ -17,8 +17,8 @@ Internal Representation and Key Implementation Points.
 
 "
 Class {
-	#name : #FBFlag,
-	#superclass : #Object,
+	#name : 'FBFlag',
+	#superclass : 'Object',
 	#instVars : [
 		'parameter',
 		'locations'
@@ -26,10 +26,12 @@ Class {
 	#classVars : [
 		'CaseSensitive'
 	],
-	#category : #'NewTools-FlagBrowser-Model'
+	#category : 'NewTools-FlagBrowser-Model',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag class >> addNew: aClass for: argument with: rbNodes in: flags [
 	self caseSensitive
 		ifFalse: [ | insensitiveArgument |
@@ -44,12 +46,12 @@ FBFlag class >> addNew: aClass for: argument with: rbNodes in: flags [
 	flags add: (aClass parameter: argument locations: (self toLocations: rbNodes))
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag class >> allFlags [
 	^ self isAbstract ifTrue: [ self allFlagsInSystem ] ifFalse: [ self allInSystem ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag class >> allFlagsInSystem [
 	| flagNodes flags |
 	flags := OrderedCollection new.
@@ -64,7 +66,7 @@ FBFlag class >> allFlagsInSystem [
 	^ flags
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag class >> allInSystem [
 	| flagNodes flags |
 	self isAbstract ifTrue: [ ^ self error: 'This method can be called only on concrete classes.' ].
@@ -82,32 +84,32 @@ FBFlag class >> allInSystem [
 	^ flags
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag class >> caseSensitive [
 	^ CaseSensitive ifNil: [ CaseSensitive := true ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag class >> caseSensitive: anObject [
 	CaseSensitive := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag class >> flagClassFor: aFlagArgument [
 	^ (self allSubclasses sorted: #priority descending) detect: [ :subclass | subclass matchesArgument: aFlagArgument ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 FBFlag class >> isAbstract [
 	^ self = FBFlag
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 FBFlag class >> matchesArgument: aFlagArgument [
 	^ self subclassResponsibility
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 FBFlag class >> parameter: anArgument locations: aCollectionOfNodes [
 	^ self new
 		parameter: anArgument;
@@ -115,17 +117,17 @@ FBFlag class >> parameter: anArgument locations: aCollectionOfNodes [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag class >> priority [
 	^ self subclassResponsibility
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBFlag class >> title [
 	^ 'All flags'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag class >> toLocations: aCollectionOfRBNodes [
 	^ aCollectionOfRBNodes
 		collect: [ :node | 
@@ -134,38 +136,38 @@ FBFlag class >> toLocations: aCollectionOfRBNodes [
 			FBLocation class: methodNode methodClass selector: methodNode selector interval: node sourceInterval ]
 ]
 
-{ #category : #adding }
+{ #category : 'adding' }
 FBFlag >> addLocations: aCollection [
 	self locations addAll: aCollection
 ]
 
-{ #category : #update }
+{ #category : 'update' }
 FBFlag >> insensitiveParameter [
 	self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag >> locations [
 	^ locations
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag >> locations: anObject [
 	locations := anObject.
 	locations do: [ :location | location owner: self ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag >> parameter [
 	^ parameter
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlag >> parameter: anObject [
 	parameter := anObject
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 FBFlag >> printOn: aStream [
 	super printOn: aStream.
 
diff --git a/src/NewTools-FlagBrowser/FBFlagPresentationPresenter.class.st b/src/NewTools-FlagBrowser/FBFlagPresentationPresenter.class.st
index 1d4959461..18e6d9a1a 100644
--- a/src/NewTools-FlagBrowser/FBFlagPresentationPresenter.class.st
+++ b/src/NewTools-FlagBrowser/FBFlagPresentationPresenter.class.st
@@ -13,31 +13,33 @@ Internal Representation and Key Implementation Points.
 
 "
 Class {
-	#name : #FBFlagPresentationPresenter,
-	#superclass : #FBPagePresenter,
+	#name : 'FBFlagPresentationPresenter',
+	#superclass : 'FBPagePresenter',
 	#instVars : [
 		'code',
 		'locationsTable'
 	],
-	#category : #'NewTools-FlagBrowser-Presenters'
+	#category : 'NewTools-FlagBrowser-Presenters',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Presenters'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 FBFlagPresentationPresenter class >> isAbstract [
 	^ self = FBFlagPresentationPresenter
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlagPresentationPresenter >> code [
 	^ code
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlagPresentationPresenter >> code: anObject [
 	code := anObject
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBFlagPresentationPresenter >> initializePresenter [
 
 	code whenSubmitDo: [ :text | code behavior compile: text ].
@@ -50,7 +52,7 @@ FBFlagPresentationPresenter >> initializePresenter [
 				selectionInterval: location interval ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBFlagPresentationPresenter >> initializeWidgets [
 	locationsTable := self newTable.
 	code := self newCode.
@@ -62,17 +64,17 @@ FBFlagPresentationPresenter >> initializeWidgets [
 	code syntaxHighlight: true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlagPresentationPresenter >> locationsTable [
 	^ locationsTable
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBFlagPresentationPresenter >> locationsTable: anObject [
 	locationsTable := anObject
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FBFlagPresentationPresenter >> tableMenu [
 	| aMenu |
 	
diff --git a/src/NewTools-FlagBrowser/FBLocation.class.st b/src/NewTools-FlagBrowser/FBLocation.class.st
index 24fd5012d..d3ae889ca 100644
--- a/src/NewTools-FlagBrowser/FBLocation.class.st
+++ b/src/NewTools-FlagBrowser/FBLocation.class.st
@@ -17,18 +17,20 @@ Internal Representation and Key Implementation Points.
 
 "
 Class {
-	#name : #FBLocation,
-	#superclass : #Object,
+	#name : 'FBLocation',
+	#superclass : 'Object',
 	#instVars : [
 		'classLocation',
 		'selector',
 		'interval',
 		'owner'
 	],
-	#category : #'NewTools-FlagBrowser-Model'
+	#category : 'NewTools-FlagBrowser-Model',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 FBLocation class >> class: aClass selector: aMethodSelector interval: anInterval [
 	^ self new
 		classLocation: aClass;
@@ -37,7 +39,7 @@ FBLocation class >> class: aClass selector: aMethodSelector interval: anInterval
 		yourself
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 FBLocation >> = anObject [
 	"Answer whether the receiver and anObject represent the same object."
 
@@ -46,69 +48,69 @@ FBLocation >> = anObject [
 	^ selector = anObject selector and: [ classLocation = anObject classLocation and: [ interval = anObject interval ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBLocation >> classLocation [
 	^ classLocation
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBLocation >> classLocation: anObject [
 	classLocation := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBLocation >> compiledMethod [
 	^ self classLocation >> self selector
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 FBLocation >> hash [
 	"Answer an integer value that is related to the identity of the receiver."
 
 	^ selector hash bitXor: (classLocation hash bitXor: interval hash)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBLocation >> interval [
 	^ interval
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBLocation >> interval: anObject [
 	interval := anObject
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBLocation >> openInBrowser [
 	Smalltalk tools browser openOnMethod: self compiledMethod
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBLocation >> owner [
 	^ owner
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBLocation >> owner: aFlag [
 	owner := aFlag
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBLocation >> package [
 	^ self classLocation package
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBLocation >> selector [
 	^ selector
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBLocation >> selector: anObject [
 	selector := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBLocation >> sourceCode [
 	^ self compiledMethod sourceCode
 ]
diff --git a/src/NewTools-FlagBrowser/FBObjectFlag.class.st b/src/NewTools-FlagBrowser/FBObjectFlag.class.st
index 87785df6d..f48b8293b 100644
--- a/src/NewTools-FlagBrowser/FBObjectFlag.class.st
+++ b/src/NewTools-FlagBrowser/FBObjectFlag.class.st
@@ -5,27 +5,29 @@ Description
 I represent a flag which parameter is an Object.
 "
 Class {
-	#name : #FBObjectFlag,
-	#superclass : #FBFlag,
-	#category : #'NewTools-FlagBrowser-Model'
+	#name : 'FBObjectFlag',
+	#superclass : 'FBFlag',
+	#category : 'NewTools-FlagBrowser-Model',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 FBObjectFlag class >> matchesArgument: aFlagArgument [
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBObjectFlag class >> priority [
 	^ 0
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBObjectFlag class >> title [
 	^ 'Object flags'
 ]
 
-{ #category : #update }
+{ #category : 'update' }
 FBObjectFlag >> insensitiveParameter [
 	"Do nothing for objects."
 ]
diff --git a/src/NewTools-FlagBrowser/FBPagePresenter.class.st b/src/NewTools-FlagBrowser/FBPagePresenter.class.st
index 215aa426a..bd57db6a1 100644
--- a/src/NewTools-FlagBrowser/FBPagePresenter.class.st
+++ b/src/NewTools-FlagBrowser/FBPagePresenter.class.st
@@ -7,32 +7,34 @@ I represent a tab of the FlagBrowser.
 We different subclasses will organize flags in different ways.
 "
 Class {
-	#name : #FBPagePresenter,
-	#superclass : #SpPresenter,
-	#category : #'NewTools-FlagBrowser-Presenters'
+	#name : 'FBPagePresenter',
+	#superclass : 'SpPresenter',
+	#category : 'NewTools-FlagBrowser-Presenters',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Presenters'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBPagePresenter class >> allPages [
 	^ (self allSubclasses reject: #isAbstract) sorted: #priority ascending
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBPagePresenter class >> icon [
 	^ self subclassResponsibility
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 FBPagePresenter class >> isAbstract [
 	^ self = FBPagePresenter
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBPagePresenter class >> priority [
 	^ self subclassResponsibility
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 FBPagePresenter class >> title [
 	^ self subclassResponsibility
 ]
diff --git a/src/NewTools-FlagBrowser/FBStringFlag.class.st b/src/NewTools-FlagBrowser/FBStringFlag.class.st
index 2e0551b5b..76966ef06 100644
--- a/src/NewTools-FlagBrowser/FBStringFlag.class.st
+++ b/src/NewTools-FlagBrowser/FBStringFlag.class.st
@@ -5,27 +5,29 @@ Description
 I represent a flag which parameter is a String.
 "
 Class {
-	#name : #FBStringFlag,
-	#superclass : #FBFlag,
-	#category : #'NewTools-FlagBrowser-Model'
+	#name : 'FBStringFlag',
+	#superclass : 'FBFlag',
+	#category : 'NewTools-FlagBrowser-Model',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 FBStringFlag class >> matchesArgument: aFlagArgument [
 	^ aFlagArgument isString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBStringFlag class >> priority [
 	^ 10
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBStringFlag class >> title [
 	^ 'String flags'
 ]
 
-{ #category : #update }
+{ #category : 'update' }
 FBStringFlag >> insensitiveParameter [
 	self parameter: self parameter asLowercase capitalized
 ]
diff --git a/src/NewTools-FlagBrowser/FBSymbolFlag.class.st b/src/NewTools-FlagBrowser/FBSymbolFlag.class.st
index 8c2c6b76a..9c7539ce3 100644
--- a/src/NewTools-FlagBrowser/FBSymbolFlag.class.st
+++ b/src/NewTools-FlagBrowser/FBSymbolFlag.class.st
@@ -5,27 +5,29 @@ Description
 I represent a flag which parameter is a Symbol.
 "
 Class {
-	#name : #FBSymbolFlag,
-	#superclass : #FBFlag,
-	#category : #'NewTools-FlagBrowser-Model'
+	#name : 'FBSymbolFlag',
+	#superclass : 'FBFlag',
+	#category : 'NewTools-FlagBrowser-Model',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 FBSymbolFlag class >> matchesArgument: aFlagArgument [
 	^ aFlagArgument isSymbol
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FBSymbolFlag class >> priority [
 	^ 20
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 FBSymbolFlag class >> title [
 	^ 'Symbol flags'
 ]
 
-{ #category : #update }
+{ #category : 'update' }
 FBSymbolFlag >> insensitiveParameter [
 	self parameter: self parameter asLowercase capitalized asSymbol
 ]
diff --git a/src/NewTools-FlagBrowser/FlagBrowser.class.st b/src/NewTools-FlagBrowser/FlagBrowser.class.st
index 0e503ad60..fc8704348 100644
--- a/src/NewTools-FlagBrowser/FlagBrowser.class.st
+++ b/src/NewTools-FlagBrowser/FlagBrowser.class.st
@@ -7,15 +7,17 @@ I am a browser allowing one to browse the flags in the system.
 I can organize them in different ways such as flags by flags parameters, flags by class or flags by packages.
 "
 Class {
-	#name : #FlagBrowser,
-	#superclass : #StPresenter,
+	#name : 'FlagBrowser',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'tabs'
 	],
-	#category : #'NewTools-FlagBrowser-Presenters'
+	#category : 'NewTools-FlagBrowser-Presenters',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Presenters'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 FlagBrowser class >> defaultSpec [
 
 	^ SpBoxLayout newVertical
@@ -23,7 +25,7 @@ FlagBrowser class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #'world menu' }
+{ #category : 'world menu' }
 FlagBrowser class >> menuCommandOn: aBuilder [
 	<worldMenu>
 	(aBuilder item: #'Flags Browser')
@@ -35,13 +37,13 @@ FlagBrowser class >> menuCommandOn: aBuilder [
 		withSeparatorAfter 
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 FlagBrowser class >> open [
 	<script>
 	self new openWithSpec
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FlagBrowser >> initializeWidgets [
 	tabs := self newNotebook.
 
@@ -52,7 +54,7 @@ FlagBrowser >> initializeWidgets [
 			provider: [ self instantiate: aPage ]) ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 FlagBrowser >> initializeWindow: aWindowPresenter [
 
 	super initializeWindow: aWindowPresenter.
diff --git a/src/NewTools-FlagBrowser/ManifestNewToolsFlagBrowser.class.st b/src/NewTools-FlagBrowser/ManifestNewToolsFlagBrowser.class.st
index 6323d8965..1cc00c07b 100644
--- a/src/NewTools-FlagBrowser/ManifestNewToolsFlagBrowser.class.st
+++ b/src/NewTools-FlagBrowser/ManifestNewToolsFlagBrowser.class.st
@@ -2,7 +2,9 @@
 I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser
 "
 Class {
-	#name : #ManifestNewToolsFlagBrowser,
-	#superclass : #PackageManifest,
-	#category : #'NewTools-FlagBrowser-Manifest'
+	#name : 'ManifestNewToolsFlagBrowser',
+	#superclass : 'PackageManifest',
+	#category : 'NewTools-FlagBrowser-Manifest',
+	#package : 'NewTools-FlagBrowser',
+	#tag : 'Manifest'
 }
diff --git a/src/NewTools-FlagBrowser/package.st b/src/NewTools-FlagBrowser/package.st
index 8c8c19b06..4f8a5d7c1 100644
--- a/src/NewTools-FlagBrowser/package.st
+++ b/src/NewTools-FlagBrowser/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-FlagBrowser' }
+Package { #name : 'NewTools-FlagBrowser' }
diff --git a/src/NewTools-FontChooser-Tests/FontChooserTest.class.st b/src/NewTools-FontChooser-Tests/FontChooserTest.class.st
index 91e8929c3..004c5699d 100644
--- a/src/NewTools-FontChooser-Tests/FontChooserTest.class.st
+++ b/src/NewTools-FontChooser-Tests/FontChooserTest.class.st
@@ -1,13 +1,14 @@
 Class {
-	#name : #FontChooserTest,
-	#superclass : #TestCase,
+	#name : 'FontChooserTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'chooser'
 	],
-	#category : #'NewTools-FontChooser-Tests'
+	#category : 'NewTools-FontChooser-Tests',
+	#package : 'NewTools-FontChooser-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 FontChooserTest >> setUp [
 	
 	super setUp.
@@ -17,7 +18,7 @@ FontChooserTest >> setUp [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 FontChooserTest >> testFontList [
 	
 	self deny: chooser fontList isEmpty.
diff --git a/src/NewTools-FontChooser-Tests/package.st b/src/NewTools-FontChooser-Tests/package.st
index d357fb05f..35310657d 100644
--- a/src/NewTools-FontChooser-Tests/package.st
+++ b/src/NewTools-FontChooser-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-FontChooser-Tests' }
+Package { #name : 'NewTools-FontChooser-Tests' }
diff --git a/src/NewTools-FontChooser/FontChooser.class.st b/src/NewTools-FontChooser/FontChooser.class.st
index a5129093b..4b1cca497 100644
--- a/src/NewTools-FontChooser/FontChooser.class.st
+++ b/src/NewTools-FontChooser/FontChooser.class.st
@@ -5,18 +5,19 @@ Check the constructors in the class side to see how to use me.
 I can be used in modal and non-modal way.
 "
 Class {
-	#name : #FontChooser,
-	#superclass : #Model,
+	#name : 'FontChooser',
+	#superclass : 'Model',
 	#instVars : [
 		'fontList',
 		'title',
 		'font',
 		'onAcceptDo'
 	],
-	#category : #'NewTools-FontChooser'
+	#category : 'NewTools-FontChooser',
+	#package : 'NewTools-FontChooser'
 }
 
-{ #category : #enumerating }
+{ #category : 'enumerating' }
 FontChooser class >> example [
 
 	<script>
@@ -27,32 +28,32 @@ FontChooser class >> example [
 		onAcceptDo: [ :aFont | aFont inspect ]
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 FontChooser class >> newWithAllFamilies [
 
    ^ self new fontList: LogicalFontManager current allFamilies; yourself
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 FontChooser class >> newWithDefaultFamilies [
 
    ^ self new fontList: LogicalFontManager current defaultFamilies; yourself
 ]
 
-{ #category : #enumerating }
+{ #category : 'enumerating' }
 FontChooser class >> openModalWithTitle: aTitle initialFont: aFont onAcceptDo: aBlock [
 
 	^ self openWithTitle: aTitle initialFont: aFont onAcceptDo: aBlock modal: true.
 	
 ]
 
-{ #category : #enumerating }
+{ #category : 'enumerating' }
 FontChooser class >> openWithTitle: aTitle initialFont: aFont onAcceptDo: aBlock [
 
 	^ self openWithTitle: aTitle initialFont: aFont onAcceptDo: aBlock modal: false
 ]
 
-{ #category : #enumerating }
+{ #category : 'enumerating' }
 FontChooser class >> openWithTitle: aTitle initialFont: aFont onAcceptDo: aBlock modal: isModal [
 
 	| instance presenter |
@@ -72,44 +73,44 @@ FontChooser class >> openWithTitle: aTitle initialFont: aFont onAcceptDo: aBlock
 	^ instance
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FontChooser >> font [
 	^ font
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FontChooser >> font: aLogicalFont [ 
 	
 	font := aLogicalFont
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FontChooser >> fontList [
 	^ fontList
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FontChooser >> fontList: aCollection [ 
 	fontList := aCollection
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FontChooser >> onAcceptDo [
 	^ onAcceptDo
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FontChooser >> onAcceptDo: aFullBlockClosure [ 
 	
 	onAcceptDo := aFullBlockClosure 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FontChooser >> title [
 	^ title
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FontChooser >> title: aString [ 
 	
 	title := aString
diff --git a/src/NewTools-FontChooser/LogicalFontManager.extension.st b/src/NewTools-FontChooser/LogicalFontManager.extension.st
index d20b15c28..b7bcd30fd 100644
--- a/src/NewTools-FontChooser/LogicalFontManager.extension.st
+++ b/src/NewTools-FontChooser/LogicalFontManager.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #LogicalFontManager }
+Extension { #name : 'LogicalFontManager' }
 
-{ #category : #'*NewTools-FontChooser' }
+{ #category : '*NewTools-FontChooser' }
 LogicalFontManager >> defaultFamilies [
 	"answer an Array containing the default TextStyle font families, sorted by family name"
 
diff --git a/src/NewTools-FontChooser/PragmaSetting.extension.st b/src/NewTools-FontChooser/PragmaSetting.extension.st
index 8cf2ea43a..59eecbf15 100644
--- a/src/NewTools-FontChooser/PragmaSetting.extension.st
+++ b/src/NewTools-FontChooser/PragmaSetting.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #PragmaSetting }
+Extension { #name : 'PragmaSetting' }
 
-{ #category : #'*NewTools-FontChooser' }
+{ #category : '*NewTools-FontChooser' }
 PragmaSetting >> getFont [
 
 	| chooser |
diff --git a/src/NewTools-FontChooser/RubTextEditor.extension.st b/src/NewTools-FontChooser/RubTextEditor.extension.st
index b639738c5..b6b10a35a 100644
--- a/src/NewTools-FontChooser/RubTextEditor.extension.st
+++ b/src/NewTools-FontChooser/RubTextEditor.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #RubTextEditor }
+Extension { #name : 'RubTextEditor' }
 
-{ #category : #'*NewTools-FontChooser' }
+{ #category : '*NewTools-FontChooser' }
 RubTextEditor >> changeTextFont [
 	"Present a menu of available fonts, and if one is chosen, apply it to the current selection."
 
diff --git a/src/NewTools-FontChooser/StFontChooserPresenter.class.st b/src/NewTools-FontChooser/StFontChooserPresenter.class.st
index 0d9ba93c0..217a09107 100644
--- a/src/NewTools-FontChooser/StFontChooserPresenter.class.st
+++ b/src/NewTools-FontChooser/StFontChooserPresenter.class.st
@@ -10,8 +10,8 @@ For example to work on a subset of fonts, provide a specific font chooser qs fol
 ```
 "
 Class {
-	#name : #StFontChooserPresenter,
-	#superclass : #SpPresenterWithModel,
+	#name : 'StFontChooserPresenter',
+	#superclass : 'SpPresenterWithModel',
 	#instVars : [
 		'fontFamilyList',
 		'fontStyleList',
@@ -19,10 +19,11 @@ Class {
 		'languageList',
 		'previewText'
 	],
-	#category : #'NewTools-FontChooser'
+	#category : 'NewTools-FontChooser',
+	#package : 'NewTools-FontChooser'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 StFontChooserPresenter class >> defaultLayout [ 
 
 	^ SpPanedLayout newTopToBottom
@@ -41,7 +42,7 @@ StFontChooserPresenter class >> defaultLayout [
 			
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StFontChooserPresenter class >> defaultSpec [ 
 
 	^ SpPanedLayout newTopToBottom
@@ -60,7 +61,7 @@ StFontChooserPresenter class >> defaultSpec [
 			
 ]
 
-{ #category : #'interface building' }
+{ #category : 'interface building' }
 StFontChooserPresenter class >> pangrams [
 
 	^ OrderedCollection new
@@ -112,14 +113,14 @@ StFontChooserPresenter class >> pangrams [
 		yourself
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StFontChooserPresenter >> applyChanges [
 
 	self model font: self selectedFont.
 	self model onAcceptDo value: self model font
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFontChooserPresenter >> connectPresenters [ 
 	
 	fontFamilyList 
@@ -141,26 +142,26 @@ StFontChooserPresenter >> connectPresenters [
 			selection selectedItem ifNotNil: [ self updatePreview ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFontChooserPresenter >> fontFamilyList [ 
 	
 	^ fontFamilyList 
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFontChooserPresenter >> fontSizeList [ 
 	
 	^ fontSizeList 
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFontChooserPresenter >> fontStyleList [
 	^ fontStyleList
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFontChooserPresenter >> initializeDialogWindow: aDialogWindowPresenter [
 	
 	super initializeDialogWindow: aDialogWindowPresenter.
@@ -172,7 +173,7 @@ StFontChooserPresenter >> initializeDialogWindow: aDialogWindowPresenter [
 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFontChooserPresenter >> initializePresenters [ 
 	
 	fontFamilyList := self newList.
@@ -197,20 +198,20 @@ StFontChooserPresenter >> initializePresenters [
 	previewText := self newMorph
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFontChooserPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter initialExtent: 800@580.
 	aWindowPresenter title: self model title
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFontChooserPresenter >> modelChanged [  
 	
 	self updateWithFont: self model font
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFontChooserPresenter >> previewText [
 
 	"Answer the preview text based on current font."
@@ -247,7 +248,7 @@ StFontChooserPresenter >> previewText [
 	^ sample contents
 ]
 
-{ #category : #refreshing }
+{ #category : 'refreshing' }
 StFontChooserPresenter >> refreshFontSizeList [
 	
 	| sizes currentFontSizeValue |
@@ -267,7 +268,7 @@ StFontChooserPresenter >> refreshFontSizeList [
 			ifFalse: [fontSizeList selectIndex: 1]].
 ]
 
-{ #category : #'font style list' }
+{ #category : 'font style list' }
 StFontChooserPresenter >> refreshFontStyleList [
 								
 	| fontStyle toFindName currentFontStyleValue |
@@ -289,7 +290,7 @@ StFontChooserPresenter >> refreshFontStyleList [
 				ifNotNil: [ fontStyleList selectItem: fontStyle  ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFontChooserPresenter >> selectedFont [
 	
 	^LogicalFont 
@@ -300,31 +301,31 @@ StFontChooserPresenter >> selectedFont [
 		slantValue: self selectedFontStyle slantValue
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFontChooserPresenter >> selectedFontFamily [
 	
 	^ fontFamilyList selectedItem 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFontChooserPresenter >> selectedFontSize [
 	
 	^ fontSizeList selectedItem
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFontChooserPresenter >> selectedFontStyle [
 	
 	^ fontStyleList selectedItem
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFontChooserPresenter >> title [ 
 
 	^ 'Font Chooser'
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StFontChooserPresenter >> updateFonts [
 	
 	FreeTypeFontProvider current updateFromSystem.
@@ -332,7 +333,7 @@ StFontChooserPresenter >> updateFonts [
 
 ]
 
-{ #category : #refreshing }
+{ #category : 'refreshing' }
 StFontChooserPresenter >> updatePreview [
 	
 	previewText morph: (RubEditingArea new
@@ -344,7 +345,7 @@ StFontChooserPresenter >> updatePreview [
 		yourself)
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFontChooserPresenter >> updateWithFont: aFont [
 
 	| initialFamily initialStyle |
diff --git a/src/NewTools-FontChooser/StFontChooserPresenterTest.class.st b/src/NewTools-FontChooser/StFontChooserPresenterTest.class.st
index c378466c6..3718b9203 100644
--- a/src/NewTools-FontChooser/StFontChooserPresenterTest.class.st
+++ b/src/NewTools-FontChooser/StFontChooserPresenterTest.class.st
@@ -1,13 +1,14 @@
 Class {
-	#name : #StFontChooserPresenterTest,
-	#superclass : #TestCase,
+	#name : 'StFontChooserPresenterTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'presenter'
 	],
-	#category : #'NewTools-FontChooser'
+	#category : 'NewTools-FontChooser',
+	#package : 'NewTools-FontChooser'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StFontChooserPresenterTest >> setUp [
 
 	| fontChooser |
@@ -22,7 +23,7 @@ StFontChooserPresenterTest >> setUp [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFontChooserPresenterTest >> testFamilyListCorrectAtInitialization [
 
 	self deny: presenter fontFamilyList items isEmpty.
@@ -31,13 +32,13 @@ StFontChooserPresenterTest >> testFamilyListCorrectAtInitialization [
 	self assert: (presenter fontFamilyList displayValueAt: 1) equals: 'Bitmap DejaVu Sans'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFontChooserPresenterTest >> testFirstStyleIsSelected [
 	
 	self assert: (presenter fontStyleList selectedItems collect: [:each | each styleName ]) equals: #('Regular')
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFontChooserPresenterTest >> testPresenterOpenAndClose [
 	
 	self shouldnt: [ 
@@ -46,7 +47,7 @@ StFontChooserPresenterTest >> testPresenterOpenAndClose [
 			window close ] raise: Error
 ]
 
-{ #category : #'tests - keep selection' }
+{ #category : 'tests - keep selection' }
 StFontChooserPresenterTest >> testSelectionInFontStyleListIsKept [
 
 
@@ -56,7 +57,7 @@ StFontChooserPresenterTest >> testSelectionInFontStyleListIsKept [
 	self assert: presenter fontStyleList selection selectedIndex equals: 3
 ]
 
-{ #category : #'tests - keep selection' }
+{ #category : 'tests - keep selection' }
 StFontChooserPresenterTest >> testSelectionInFontStyleListIsKept2 [
 
 	| string |
@@ -67,7 +68,7 @@ StFontChooserPresenterTest >> testSelectionInFontStyleListIsKept2 [
 	self assert: presenter fontStyleList selection selectedItem styleName equals: string
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StFontChooserPresenterTest >> testStyleIsDisplayed [
 	
 	self assert: presenter fontStyleList items size equals: #('Regular' 'Italic' 'Bold' 'Bold Italic') size
diff --git a/src/NewTools-FontChooser/StringMorph.extension.st b/src/NewTools-FontChooser/StringMorph.extension.st
index cce6639e5..76d4c5720 100644
--- a/src/NewTools-FontChooser/StringMorph.extension.st
+++ b/src/NewTools-FontChooser/StringMorph.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #StringMorph }
+Extension { #name : 'StringMorph' }
 
-{ #category : #'*NewTools-FontChooser' }
+{ #category : '*NewTools-FontChooser' }
 StringMorph >> changeFont [
 
 	FontChooser 
diff --git a/src/NewTools-FontChooser/UITheme.extension.st b/src/NewTools-FontChooser/UITheme.extension.st
index 1b0835440..256a2a63d 100644
--- a/src/NewTools-FontChooser/UITheme.extension.st
+++ b/src/NewTools-FontChooser/UITheme.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #UITheme }
+Extension { #name : 'UITheme' }
 
-{ #category : #'*NewTools-FontChooser' }
+{ #category : '*NewTools-FontChooser' }
 UITheme >> chooseFontIn: aThemedMorph title: aString font: aFont [
 	"Answer the result of a font selector dialog with the given title and initial font."
 
diff --git a/src/NewTools-FontChooser/package.st b/src/NewTools-FontChooser/package.st
index 00b428261..a91269bd3 100644
--- a/src/NewTools-FontChooser/package.st
+++ b/src/NewTools-FontChooser/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-FontChooser' }
+Package { #name : 'NewTools-FontChooser' }
diff --git a/src/NewTools-Fuel/FLFuelCommandLineHandler.class.st b/src/NewTools-Fuel/FLFuelCommandLineHandler.class.st
index 637aa3f5e..72c2de8a2 100644
--- a/src/NewTools-Fuel/FLFuelCommandLineHandler.class.st
+++ b/src/NewTools-Fuel/FLFuelCommandLineHandler.class.st
@@ -23,30 +23,32 @@ Example:
 
 "
 Class {
-	#name : #FLFuelCommandLineHandler,
-	#superclass : #CommandLineHandler,
+	#name : 'FLFuelCommandLineHandler',
+	#superclass : 'CommandLineHandler',
 	#instVars : [
 		'files'
 	],
-	#category : #'NewTools-Fuel-CommandLineHandler'
+	#category : 'NewTools-Fuel-CommandLineHandler',
+	#package : 'NewTools-Fuel',
+	#tag : 'CommandLineHandler'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FLFuelCommandLineHandler class >> commandName [
 	^ 'Fuel'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FLFuelCommandLineHandler class >> description [
 	^ 'Loads fuel files'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FLFuelCommandLineHandler class >> fileExtension [
 	^ '.fuel'
 ]
 
-{ #category : #'handler selection' }
+{ #category : 'handler selection' }
 FLFuelCommandLineHandler class >> isResponsibleFor: aCommandLine [
 	"This handler is reponsible only for .fuel files"
 	(aCommandLine hasFileWithExtension: self fileExtension)
@@ -55,7 +57,7 @@ FLFuelCommandLineHandler class >> isResponsibleFor: aCommandLine [
 	
 ]
 
-{ #category : #activation }
+{ #category : 'activation' }
 FLFuelCommandLineHandler >> activate [
 	self manageFiles.
 	(self commandLine hasOption: 'save') ifTrue: [
@@ -67,12 +69,12 @@ FLFuelCommandLineHandler >> activate [
 		self exitSuccess ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 FLFuelCommandLineHandler >> fileExtension [
 	^ self class fileExtension
 ]
 
-{ #category : #manage }
+{ #category : 'manage' }
 FLFuelCommandLineHandler >> manageFile: aFileReference [
 	Stdio stdout
 		nextPutAll: 'Materializing from file: ';
@@ -86,7 +88,7 @@ FLFuelCommandLineHandler >> manageFile: aFileReference [
 		lf
 ]
 
-{ #category : #manage }
+{ #category : 'manage' }
 FLFuelCommandLineHandler >> manageFiles [
 	"Load all the source files in the given array."
 	files := (self commandLine allFilesWithExtension: self fileExtension)
diff --git a/src/NewTools-Fuel/FLMaterializer.extension.st b/src/NewTools-Fuel/FLMaterializer.extension.st
index 7fa8a9a24..72cec8d2a 100644
--- a/src/NewTools-Fuel/FLMaterializer.extension.st
+++ b/src/NewTools-Fuel/FLMaterializer.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #FLMaterializer }
+Extension { #name : 'FLMaterializer' }
 
-{ #category : #'*NewTools-Fuel-FileRegistry' }
+{ #category : '*NewTools-Fuel-FileRegistry' }
 FLMaterializer class >> fileReaderServicesForFile: fullName suffix: suffix [
 	<fileService>
 	suffix = 'fuel'
@@ -8,7 +8,7 @@ FLMaterializer class >> fileReaderServicesForFile: fullName suffix: suffix [
 	^ { self serviceFuelMaterialize }
 ]
 
-{ #category : #'*NewTools-Fuel-FileRegistry' }
+{ #category : '*NewTools-Fuel-FileRegistry' }
 FLMaterializer class >> inspectMaterializationFromFileNamed: aString [
 	| result |
 	result := self new
@@ -17,7 +17,7 @@ FLMaterializer class >> inspectMaterializationFromFileNamed: aString [
 	^ result inspect
 ]
 
-{ #category : #'*NewTools-Fuel-FileRegistry' }
+{ #category : '*NewTools-Fuel-FileRegistry' }
 FLMaterializer class >> serviceFuelMaterialize [
 	^ SimpleServiceEntry 
 		provider: self 
diff --git a/src/NewTools-Fuel/Object.extension.st b/src/NewTools-Fuel/Object.extension.st
index 8b0d11e37..c9060bb82 100644
--- a/src/NewTools-Fuel/Object.extension.st
+++ b/src/NewTools-Fuel/Object.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #Object }
+Extension { #name : 'Object' }
 
-{ #category : #'*NewTools-Fuel' }
+{ #category : '*NewTools-Fuel' }
 Object >> fuelOut [
 	| target |
 	target := FileLocator imageDirectory / self printString asFileName, 'fuel'.
diff --git a/src/NewTools-Fuel/package.st b/src/NewTools-Fuel/package.st
index f4a807597..291216045 100644
--- a/src/NewTools-Fuel/package.st
+++ b/src/NewTools-Fuel/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Fuel' }
+Package { #name : 'NewTools-Fuel' }
diff --git a/src/NewTools-Gtk/StGtkDebugSession.class.st b/src/NewTools-Gtk/StGtkDebugSession.class.st
index 386564020..9b26997e3 100644
--- a/src/NewTools-Gtk/StGtkDebugSession.class.st
+++ b/src/NewTools-Gtk/StGtkDebugSession.class.st
@@ -1,25 +1,26 @@
 Class {
-	#name : #StGtkDebugSession,
-	#superclass : #GtkDebugSession,
+	#name : 'StGtkDebugSession',
+	#superclass : 'GtkDebugSession',
 	#instVars : [
 		'application'
 	],
-	#category : #'NewTools-Gtk'
+	#category : 'NewTools-Gtk',
+	#package : 'NewTools-Gtk'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StGtkDebugSession >> application [
 
 	^ application
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StGtkDebugSession >> application: anApplication [
 
 	application := anApplication
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StGtkDebugSession >> initialize [
 
 	super initialize. 
diff --git a/src/NewTools-Gtk/StGtkMorphicUIManager.class.st b/src/NewTools-Gtk/StGtkMorphicUIManager.class.st
index f1bdb6bef..c94478fc5 100644
--- a/src/NewTools-Gtk/StGtkMorphicUIManager.class.st
+++ b/src/NewTools-Gtk/StGtkMorphicUIManager.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StGtkMorphicUIManager,
-	#superclass : #GtkMorphicUIManager,
-	#category : #'NewTools-Gtk'
+	#name : 'StGtkMorphicUIManager',
+	#superclass : 'GtkMorphicUIManager',
+	#category : 'NewTools-Gtk',
+	#package : 'NewTools-Gtk'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StGtkMorphicUIManager >> debugSessionClass [
 
 	^ StGtkDebugSession
diff --git a/src/NewTools-Gtk/StPharoApplication.extension.st b/src/NewTools-Gtk/StPharoApplication.extension.st
index 287713023..53fdec685 100644
--- a/src/NewTools-Gtk/StPharoApplication.extension.st
+++ b/src/NewTools-Gtk/StPharoApplication.extension.st
@@ -1,12 +1,12 @@
-Extension { #name : #StPharoApplication }
+Extension { #name : 'StPharoApplication' }
 
-{ #category : #'*NewTools-Gtk' }
+{ #category : '*NewTools-Gtk' }
 StPharoApplication >> defaultConfigurationForGtk [
 
 	^ StPharoGtkConfiguration new
 ]
 
-{ #category : #'*NewTools-Gtk' }
+{ #category : '*NewTools-Gtk' }
 StPharoApplication >> syntaxHighlightTheme [
 	
 	self flag: #TODO. "This needs to be refactored as common to all platforms, but for now..."
@@ -15,13 +15,13 @@ StPharoApplication >> syntaxHighlightTheme [
 		ifAbsent: [ nil ]
 ]
 
-{ #category : #'*NewTools-Gtk' }
+{ #category : '*NewTools-Gtk' }
 StPharoApplication >> useGtk [
 
 	self useBackend: #Gtk with: StPharoGtkConfiguration new
 ]
 
-{ #category : #'*NewTools-Gtk' }
+{ #category : '*NewTools-Gtk' }
 StPharoApplication >> useGtkDark [
 
 	self useBackend: #Gtk with: StPharoGtkDarkConfiguration new
diff --git a/src/NewTools-Gtk/StPharoGtkConfiguration.class.st b/src/NewTools-Gtk/StPharoGtkConfiguration.class.st
index 0a47cd32f..3cd92a06e 100644
--- a/src/NewTools-Gtk/StPharoGtkConfiguration.class.st
+++ b/src/NewTools-Gtk/StPharoGtkConfiguration.class.st
@@ -4,12 +4,13 @@ I will install the appropriate theme for each platform (macOS or windows, in lin
 I will install additional styles needed for the platform (e.g. font style for code).
 "
 Class {
-	#name : #StPharoGtkConfiguration,
-	#superclass : #SpGtkConfiguration,
-	#category : #'NewTools-Gtk'
+	#name : 'StPharoGtkConfiguration',
+	#superclass : 'SpGtkConfiguration',
+	#category : 'NewTools-Gtk',
+	#package : 'NewTools-Gtk'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPharoGtkConfiguration >> commonStyle [
 
 	^ '
@@ -25,7 +26,7 @@ toolbar.stToolbar toolbutton > button { padding: 2px; margin: 2px }
 '
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 StPharoGtkConfiguration >> configureGeneral: anApplication [ 
 
 	super configureGeneral: anApplication.
@@ -35,7 +36,7 @@ StPharoGtkConfiguration >> configureGeneral: anApplication [
 		put: self syntaxHighlightThemeName
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 StPharoGtkConfiguration >> configureOSX: anApplication [
 
 	self installTheme: self macThemeName.
@@ -44,7 +45,7 @@ StPharoGtkConfiguration >> configureOSX: anApplication [
 '
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 StPharoGtkConfiguration >> configureUnix: anApplication [
 
 	self unixThemeName ifNotNil: [ :aName | self installTheme: aName ].
@@ -53,7 +54,7 @@ StPharoGtkConfiguration >> configureUnix: anApplication [
 '
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 StPharoGtkConfiguration >> configureWindows: anApplication [
 
 	self installTheme: self windowsThemeName.
@@ -62,25 +63,25 @@ StPharoGtkConfiguration >> configureWindows: anApplication [
 '
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPharoGtkConfiguration >> macThemeName [
 		
 	^ 'Sierra-light'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPharoGtkConfiguration >> syntaxHighlightThemeName [
 
 	^ 'Blue'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPharoGtkConfiguration >> unixThemeName [
 
 	^ nil "'Adwaita'"
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPharoGtkConfiguration >> windowsThemeName [
 
 	^ 'Windows-10-master'
diff --git a/src/NewTools-Gtk/StPharoGtkDarkConfiguration.class.st b/src/NewTools-Gtk/StPharoGtkDarkConfiguration.class.st
index 1f5eba903..512771d9e 100644
--- a/src/NewTools-Gtk/StPharoGtkDarkConfiguration.class.st
+++ b/src/NewTools-Gtk/StPharoGtkDarkConfiguration.class.st
@@ -3,30 +3,31 @@ I am a configuration for Pharo IDE for Gtk backend.
 I will install a ""dark"" version of the UI theme, according to the platform version.
 "
 Class {
-	#name : #StPharoGtkDarkConfiguration,
-	#superclass : #StPharoGtkConfiguration,
-	#category : #'NewTools-Gtk'
+	#name : 'StPharoGtkDarkConfiguration',
+	#superclass : 'StPharoGtkConfiguration',
+	#category : 'NewTools-Gtk',
+	#package : 'NewTools-Gtk'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPharoGtkDarkConfiguration >> macThemeName [
 		
 	^ 'Sierra-dark'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPharoGtkDarkConfiguration >> syntaxHighlightThemeName [
 
 	^ 'Dark'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPharoGtkDarkConfiguration >> unixThemeName [
 
 	^ nil "'Adwaita-dark'"
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPharoGtkDarkConfiguration >> windowsThemeName [
 
 	^ 'Windows-10-Dark-master'
diff --git a/src/NewTools-Gtk/package.st b/src/NewTools-Gtk/package.st
index 4ca5de1ab..435ee288a 100644
--- a/src/NewTools-Gtk/package.st
+++ b/src/NewTools-Gtk/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Gtk' }
+Package { #name : 'NewTools-Gtk' }
diff --git a/src/NewTools-HelpBrowser/SpHelpBrowserPresenter.class.st b/src/NewTools-HelpBrowser/SpHelpBrowserPresenter.class.st
index b3c86caec..790b88930 100644
--- a/src/NewTools-HelpBrowser/SpHelpBrowserPresenter.class.st
+++ b/src/NewTools-HelpBrowser/SpHelpBrowserPresenter.class.st
@@ -4,8 +4,8 @@ I manage doc that are expressed as methods of certain classes but contrary to th
 help browser I managed documentation written using Microdown.
 "
 Class {
-	#name : #SpHelpBrowserPresenter,
-	#superclass : #SpPresenter,
+	#name : 'SpHelpBrowserPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'loadedTopicList',
 		'helpText',
@@ -15,10 +15,11 @@ Class {
 		'helpTopicCache',
 		'rootTopic'
 	],
-	#category : #'NewTools-HelpBrowser'
+	#category : 'NewTools-HelpBrowser',
+	#package : 'NewTools-HelpBrowser'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 SpHelpBrowserPresenter class >> defaultSpec [
 
 	 ^ SpBoxLayout newTopToBottom
@@ -29,13 +30,13 @@ SpHelpBrowserPresenter class >> defaultSpec [
 			yourself
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 SpHelpBrowserPresenter class >> open [
 	<example>
 	^ self new openWithSpec
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 SpHelpBrowserPresenter class >> openOn: aHelpTopic [
 	"Open the receiver on the given help topic or any other object that can be transformed into
 	 a help topic by sending #asHelpTopic."
@@ -47,7 +48,7 @@ SpHelpBrowserPresenter class >> openOn: aHelpTopic [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpHelpBrowserPresenter >> connectPresenters [
  
 	loadedTopicList
@@ -57,25 +58,25 @@ SpHelpBrowserPresenter >> connectPresenters [
 					text ifNotNil: [ self render: text ]].
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 SpHelpBrowserPresenter >> dummyHelp [
 
 	^  '# Empty Help
 	This a dummy help.'
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 SpHelpBrowserPresenter >> helpTopic [
 	
 	^ helpTopicCache ifNil: [ helpTopicCache := SystemHelp asHelpTopic ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpHelpBrowserPresenter >> initialExtent [
 	^ 800@600
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpHelpBrowserPresenter >> initializePresenters [
 
 	super initializePresenters.
@@ -97,18 +98,18 @@ SpHelpBrowserPresenter >> initializePresenters [
 		yourself.
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 SpHelpBrowserPresenter >> morphWriter [ 
 		
 	^ PRRichTextComposer new
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 SpHelpBrowserPresenter >> parser [ 
 	^ MicroDownParser
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 SpHelpBrowserPresenter >> render: aString [
 
 	| document text |
@@ -121,19 +122,19 @@ SpHelpBrowserPresenter >> render: aString [
 	textOutput morph setText: (self morphWriter start: document asPillar) 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpHelpBrowserPresenter >> rootTopic [
 
 	^ rootTopic
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpHelpBrowserPresenter >> rootTopic: anObject [
 
 	rootTopic := anObject
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpHelpBrowserPresenter >> title [
 	^ 'Help Topic Browser'
 ]
diff --git a/src/NewTools-HelpBrowser/package.st b/src/NewTools-HelpBrowser/package.st
index 5109e8deb..f718914cd 100644
--- a/src/NewTools-HelpBrowser/package.st
+++ b/src/NewTools-HelpBrowser/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-HelpBrowser' }
+Package { #name : 'NewTools-HelpBrowser' }
diff --git a/src/NewTools-Inspector-Tests/StInspectorBaseTest.class.st b/src/NewTools-Inspector-Tests/StInspectorBaseTest.class.st
index de22e275f..a64b3b155 100644
--- a/src/NewTools-Inspector-Tests/StInspectorBaseTest.class.st
+++ b/src/NewTools-Inspector-Tests/StInspectorBaseTest.class.st
@@ -1,43 +1,44 @@
 Class {
-	#name : #StInspectorBaseTest,
-	#superclass : #TestCase,
+	#name : 'StInspectorBaseTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'backendForTest',
 		'application',
 		'presenter'
 	],
-	#category : #'NewTools-Inspector-Tests'
+	#category : 'NewTools-Inspector-Tests',
+	#package : 'NewTools-Inspector-Tests'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StInspectorBaseTest class >> isAbstract [
 
 	^ super isAbstract or: [ self = StInspectorBaseTest ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StInspectorBaseTest >> classToTest [
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StInspectorBaseTest >> initializeInstance: aPresenter [
 	
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StInspectorBaseTest >> initializeInstanceBeforeInitialization: aPresenter [
 	
 ]
 
-{ #category : #'private - utilities' }
+{ #category : 'private - utilities' }
 StInspectorBaseTest >> openInstance [
 
 	presenter open
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StInspectorBaseTest >> setUp [
 	super setUp.
 	
@@ -51,21 +52,21 @@ StInspectorBaseTest >> setUp [
 	self initializeInstance: presenter
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StInspectorBaseTest >> tearDown [
 
 	presenter withWindowDo: [ :window | window close ].
 	super tearDown
 ]
 
-{ #category : #'private - utilities' }
+{ #category : 'private - utilities' }
 StInspectorBaseTest >> waitUntilContentsAreFlush [
 		
 	20 milliSeconds wait
 	
 ]
 
-{ #category : #'private - utilities' }
+{ #category : 'private - utilities' }
 StInspectorBaseTest >> waitUntilUIRedrawed [
 
 	backendForTest waitUntilUIRedrawed
diff --git a/src/NewTools-Inspector-Tests/StInspectorMockObject.class.st b/src/NewTools-Inspector-Tests/StInspectorMockObject.class.st
index 0812007f2..1149317e1 100644
--- a/src/NewTools-Inspector-Tests/StInspectorMockObject.class.st
+++ b/src/NewTools-Inspector-Tests/StInspectorMockObject.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StInspectorMockObject,
-	#superclass : #Object,
-	#category : #'NewTools-Inspector-Tests'
+	#name : 'StInspectorMockObject',
+	#superclass : 'Object',
+	#category : 'NewTools-Inspector-Tests',
+	#package : 'NewTools-Inspector-Tests'
 }
 
-{ #category : #'inspector extensions' }
+{ #category : 'inspector extensions' }
 StInspectorMockObject >> inspectionMock1 [
 	<inspectorPresentationOrder: 0 title: 'Mock 1'>
 
@@ -13,7 +14,7 @@ StInspectorMockObject >> inspectionMock1 [
 		yourself
 ]
 
-{ #category : #'inspector extensions' }
+{ #category : 'inspector extensions' }
 StInspectorMockObject >> methodWithDnuingContext [
 	<inspectorPresentationOrder: 0 title: 'PresentationWithDNUingContext'>
 
@@ -22,7 +23,7 @@ StInspectorMockObject >> methodWithDnuingContext [
 		yourself
 ]
 
-{ #category : #'inspector extensions' }
+{ #category : 'inspector extensions' }
 StInspectorMockObject >> methodWithDnuingContextContext: aContext [
 	
 	"This selector is automatically called by concatenating Context: to an inspector presentation"
@@ -30,14 +31,14 @@ StInspectorMockObject >> methodWithDnuingContextContext: aContext [
 	self iShouldNotUnderstandThis
 ]
 
-{ #category : #'inspector extensions' }
+{ #category : 'inspector extensions' }
 StInspectorMockObject >> methodWithDnuingPresentation [
 	<inspectorPresentationOrder: 0 title: 'PresentationWithDNUingContext'>
 	<ignoreNotImplementedSelectors: #(iShouldNotUnderstandThis)>
 	self iShouldNotUnderstandThis
 ]
 
-{ #category : #'inspector extensions' }
+{ #category : 'inspector extensions' }
 StInspectorMockObject >> methodWithFailingContext [
 	<inspectorPresentationOrder: 0 title: 'PresentationWithFailingContext'>
 
@@ -46,7 +47,7 @@ StInspectorMockObject >> methodWithFailingContext [
 		yourself
 ]
 
-{ #category : #'inspector extensions' }
+{ #category : 'inspector extensions' }
 StInspectorMockObject >> methodWithFailingContextContext: aContext [
 	
 	"This selector is automatically called by concatenating Context: to an inspector presentation"
@@ -54,14 +55,14 @@ StInspectorMockObject >> methodWithFailingContextContext: aContext [
 	self error
 ]
 
-{ #category : #'inspector extensions' }
+{ #category : 'inspector extensions' }
 StInspectorMockObject >> methodWithFailingPresentation [
 	<inspectorPresentationOrder: 0 title: 'PresentationWithFailingPresentation'>
 
 	self error
 ]
 
-{ #category : #'inspector extensions' }
+{ #category : 'inspector extensions' }
 StInspectorMockObject >> methodWithHaltingContext [
 	<inspectorPresentationOrder: 0 title: 'PresentationWithHaltingContext'>
 
@@ -70,7 +71,7 @@ StInspectorMockObject >> methodWithHaltingContext [
 		yourself
 ]
 
-{ #category : #'inspector extensions' }
+{ #category : 'inspector extensions' }
 StInspectorMockObject >> methodWithHaltingContextContext: aContext [
 	
 	"This selector is automatically called by concatenating Context: to an inspector presentation"
@@ -79,7 +80,7 @@ StInspectorMockObject >> methodWithHaltingContextContext: aContext [
 	self halt
 ]
 
-{ #category : #'inspector extensions' }
+{ #category : 'inspector extensions' }
 StInspectorMockObject >> methodWithHaltingPresentation [
 	<inspectorPresentationOrder: 0 title: 'PresentationWithHaltingContext'>
 	<haltOrBreakpointForTesting>
diff --git a/src/NewTools-Inspector-Tests/StInspectorMockObjectSubclass.class.st b/src/NewTools-Inspector-Tests/StInspectorMockObjectSubclass.class.st
index 111cd2404..f98e41fef 100644
--- a/src/NewTools-Inspector-Tests/StInspectorMockObjectSubclass.class.st
+++ b/src/NewTools-Inspector-Tests/StInspectorMockObjectSubclass.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StInspectorMockObjectSubclass,
-	#superclass : #StInspectorMockObject,
-	#category : #'NewTools-Inspector-Tests'
+	#name : 'StInspectorMockObjectSubclass',
+	#superclass : 'StInspectorMockObject',
+	#category : 'NewTools-Inspector-Tests',
+	#package : 'NewTools-Inspector-Tests'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 StInspectorMockObjectSubclass >> inspectionMock1Context: aContext [
 
 	aContext active: false
diff --git a/src/NewTools-Inspector-Tests/StInspectorTest.class.st b/src/NewTools-Inspector-Tests/StInspectorTest.class.st
index fe3f63cdf..5cad46f81 100644
--- a/src/NewTools-Inspector-Tests/StInspectorTest.class.st
+++ b/src/NewTools-Inspector-Tests/StInspectorTest.class.st
@@ -1,13 +1,14 @@
 Class {
-	#name : #StInspectorTest,
-	#superclass : #TestCase,
+	#name : 'StInspectorTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'inspector'
 	],
-	#category : #'NewTools-Inspector-Tests'
+	#category : 'NewTools-Inspector-Tests',
+	#package : 'NewTools-Inspector-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StInspectorTest >> setUp [
 	
 	super setUp.
@@ -15,7 +16,7 @@ StInspectorTest >> setUp [
 	
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StInspectorTest >> tearDown [
 
 	inspector window 
@@ -23,7 +24,7 @@ StInspectorTest >> tearDown [
 	super tearDown
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StInspectorTest >> testBuildPresentationWithDoesNotUndertandShouldReturnCodePresenter [
 
 
@@ -37,7 +38,7 @@ StInspectorTest >> testBuildPresentationWithDoesNotUndertandShouldReturnCodePres
 	context newInspectionPresenter
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StInspectorTest >> testBuildPresentationWithFailureShouldReturnCodePresenter [
 
 
@@ -51,7 +52,7 @@ StInspectorTest >> testBuildPresentationWithFailureShouldReturnCodePresenter [
 	context newInspectionPresenter
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StInspectorTest >> testBuildPresentationWithHaltShouldReturnCodePresenter [
 
 
@@ -65,7 +66,7 @@ StInspectorTest >> testBuildPresentationWithHaltShouldReturnCodePresenter [
 	context newInspectionPresenter
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StInspectorTest >> testConfigureContextWithDoesNotUnderstandShouldMarkContextAsError [
 
 
@@ -77,7 +78,7 @@ StInspectorTest >> testConfigureContextWithDoesNotUnderstandShouldMarkContextAsE
 	self assert: context isErrorContext
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StInspectorTest >> testConfigureContextWithErrorShouldMarkContextAsError [
 
 
@@ -89,7 +90,7 @@ StInspectorTest >> testConfigureContextWithErrorShouldMarkContextAsError [
 	self assert: context isErrorContext
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StInspectorTest >> testConfigureContextWithHaltShouldMarkContextAsError [
 
 
@@ -101,7 +102,7 @@ StInspectorTest >> testConfigureContextWithHaltShouldMarkContextAsError [
 	self assert: context isErrorContext
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StInspectorTest >> testContextSelectorForBuilderSelector [
 
 	| c |
@@ -112,7 +113,7 @@ StInspectorTest >> testContextSelectorForBuilderSelector [
 		equals: #selectorWithArgumentContext:
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StInspectorTest >> testContextSelectorForNonBuilderSelector [
 
 	| c |
@@ -123,7 +124,7 @@ StInspectorTest >> testContextSelectorForNonBuilderSelector [
 		equals: #selectorWithoutArgumentContext:
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StInspectorTest >> testDefaultKeyboardFocus [
 
 	inspector open.
@@ -132,7 +133,7 @@ StInspectorTest >> testDefaultKeyboardFocus [
 		equals: inspector millerList presenters first
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StInspectorTest >> testDefineContextInSubclass [
 
 	| c |
@@ -141,7 +142,7 @@ StInspectorTest >> testDefineContextInSubclass [
 	self deny: (c contextFromPragma: (StInspectorMockObject >> #inspectionMock1) pragmas first) isActive
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StInspectorTest >> testFirstPage [
 
 	inspector open.
@@ -150,7 +151,7 @@ StInspectorTest >> testFirstPage [
 		(inspector firstPage isKindOf: StObjectInspectorPresenter)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StInspectorTest >> testModel [
 
 	self assert: inspector model inspectedObject equals: 42.
diff --git a/src/NewTools-Inspector-Tests/StObjectContextModelTest.class.st b/src/NewTools-Inspector-Tests/StObjectContextModelTest.class.st
index 07dd582dc..503948b48 100644
--- a/src/NewTools-Inspector-Tests/StObjectContextModelTest.class.st
+++ b/src/NewTools-Inspector-Tests/StObjectContextModelTest.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StObjectContextModelTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-Inspector-Tests'
+	#name : 'StObjectContextModelTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-Inspector-Tests',
+	#package : 'NewTools-Inspector-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StObjectContextModelTest >> testStringWithoutInitialCommentFrom [
 	| model string | 
 		
diff --git a/src/NewTools-Inspector-Tests/StObjectContextPresenterTest.class.st b/src/NewTools-Inspector-Tests/StObjectContextPresenterTest.class.st
index 2bc1824f0..4fed6d480 100644
--- a/src/NewTools-Inspector-Tests/StObjectContextPresenterTest.class.st
+++ b/src/NewTools-Inspector-Tests/StObjectContextPresenterTest.class.st
@@ -1,16 +1,17 @@
 Class {
-	#name : #StObjectContextPresenterTest,
-	#superclass : #StInspectorBaseTest,
-	#category : #'NewTools-Inspector-Tests'
+	#name : 'StObjectContextPresenterTest',
+	#superclass : 'StInspectorBaseTest',
+	#category : 'NewTools-Inspector-Tests',
+	#package : 'NewTools-Inspector-Tests'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StObjectContextPresenterTest >> classToTest [
 
 	^ StObjectContextPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StObjectContextPresenterTest >> initializeInstanceBeforeInitialization: aPresenter [
 	| model context |
 
@@ -24,7 +25,7 @@ StObjectContextPresenterTest >> initializeInstanceBeforeInitialization: aPresent
 		yourself)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StObjectContextPresenterTest >> testDoEvaluateAndGo [
 	| evaluatedValue |
 
@@ -38,7 +39,7 @@ StObjectContextPresenterTest >> testDoEvaluateAndGo [
 	self assert: evaluatedValue equals: 4
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StObjectContextPresenterTest >> testDoEvaluateDeclareGlobal [
 	| value |
 	
diff --git a/src/NewTools-Inspector-Tests/StObjectPrinterTest.class.st b/src/NewTools-Inspector-Tests/StObjectPrinterTest.class.st
index 74ad69f45..e2a1b52ce 100644
--- a/src/NewTools-Inspector-Tests/StObjectPrinterTest.class.st
+++ b/src/NewTools-Inspector-Tests/StObjectPrinterTest.class.st
@@ -1,16 +1,17 @@
 Class {
-	#name : #StObjectPrinterTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-Inspector-Tests'
+	#name : 'StObjectPrinterTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-Inspector-Tests',
+	#package : 'NewTools-Inspector-Tests'
 }
 
-{ #category : #assertions }
+{ #category : 'assertions' }
 StObjectPrinterTest >> assertIsError: aCollection expectedMessage: aMessage [
 	
 	self assert: aCollection asString equals: 'Error printing: ', aMessage.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StObjectPrinterTest >> testPrintDoesNotUnderstand [
 
 	| printedValue selector error |
@@ -22,7 +23,7 @@ StObjectPrinterTest >> testPrintDoesNotUnderstand [
 	self assertIsError: printedValue expectedMessage: error messageText
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StObjectPrinterTest >> testPrintError [
 
 	| printedValue |
@@ -31,7 +32,7 @@ StObjectPrinterTest >> testPrintError [
 	self assertIsError: printedValue expectedMessage: 'Some error message'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StObjectPrinterTest >> testPrintHalt [
 
 	| printedValue |
diff --git a/src/NewTools-Inspector-Tests/StObjectWithPrintDoesNotUnderstand.class.st b/src/NewTools-Inspector-Tests/StObjectWithPrintDoesNotUnderstand.class.st
index 1610ecf5b..30377947b 100644
--- a/src/NewTools-Inspector-Tests/StObjectWithPrintDoesNotUnderstand.class.st
+++ b/src/NewTools-Inspector-Tests/StObjectWithPrintDoesNotUnderstand.class.st
@@ -1,23 +1,24 @@
 Class {
-	#name : #StObjectWithPrintDoesNotUnderstand,
-	#superclass : #Object,
+	#name : 'StObjectWithPrintDoesNotUnderstand',
+	#superclass : 'Object',
 	#instVars : [
 		'selector'
 	],
-	#category : #'NewTools-Inspector-Tests'
+	#category : 'NewTools-Inspector-Tests',
+	#package : 'NewTools-Inspector-Tests'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StObjectWithPrintDoesNotUnderstand class >> withMissingMessageSelector: aString [ 
 	^ self new missingMessageSelector: aString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StObjectWithPrintDoesNotUnderstand >> missingMessageSelector: aString [ 
 	selector := aString
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StObjectWithPrintDoesNotUnderstand >> printOn: aString [
 
 	^ self perform: selector
diff --git a/src/NewTools-Inspector-Tests/StObjectWithPrintError.class.st b/src/NewTools-Inspector-Tests/StObjectWithPrintError.class.st
index 928e310e5..83643a27b 100644
--- a/src/NewTools-Inspector-Tests/StObjectWithPrintError.class.st
+++ b/src/NewTools-Inspector-Tests/StObjectWithPrintError.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StObjectWithPrintError,
-	#superclass : #Object,
-	#category : #'NewTools-Inspector-Tests'
+	#name : 'StObjectWithPrintError',
+	#superclass : 'Object',
+	#category : 'NewTools-Inspector-Tests',
+	#package : 'NewTools-Inspector-Tests'
 }
 
-{ #category : #printing }
+{ #category : 'printing' }
 StObjectWithPrintError >> printOn: aString [
 
 	^ self error: 'Some error message'
diff --git a/src/NewTools-Inspector-Tests/StObjectWithPrintHalt.class.st b/src/NewTools-Inspector-Tests/StObjectWithPrintHalt.class.st
index b87de44cd..0a3540814 100644
--- a/src/NewTools-Inspector-Tests/StObjectWithPrintHalt.class.st
+++ b/src/NewTools-Inspector-Tests/StObjectWithPrintHalt.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StObjectWithPrintHalt,
-	#superclass : #Object,
-	#category : #'NewTools-Inspector-Tests'
+	#name : 'StObjectWithPrintHalt',
+	#superclass : 'Object',
+	#category : 'NewTools-Inspector-Tests',
+	#package : 'NewTools-Inspector-Tests'
 }
 
-{ #category : #printing }
+{ #category : 'printing' }
 StObjectWithPrintHalt >> printOn: aString [
 
 	<haltOrBreakpointForTesting>
diff --git a/src/NewTools-Inspector-Tests/package.st b/src/NewTools-Inspector-Tests/package.st
index 2e7a86388..d6e862906 100644
--- a/src/NewTools-Inspector-Tests/package.st
+++ b/src/NewTools-Inspector-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Inspector-Tests' }
+Package { #name : 'NewTools-Inspector-Tests' }
diff --git a/src/NewTools-KeymapBrowser/SpKeymapPresenter.class.st b/src/NewTools-KeymapBrowser/SpKeymapPresenter.class.st
index f0e84b570..977a2b90b 100644
--- a/src/NewTools-KeymapBrowser/SpKeymapPresenter.class.st
+++ b/src/NewTools-KeymapBrowser/SpKeymapPresenter.class.st
@@ -4,17 +4,18 @@ It shows a filterable list of keymap shortcuts,  name and categories.
 Use the context menu to browse the method that defines the shortcut.
 "
 Class {
-	#name : #SpKeymapPresenter,
-	#superclass : #StPresenter,
+	#name : 'SpKeymapPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'clearFilterButton',
 		'filterField',
 		'keymapTable'
 	],
-	#category : #'NewTools-KeymapBrowser'
+	#category : 'NewTools-KeymapBrowser',
+	#package : 'NewTools-KeymapBrowser'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 SpKeymapPresenter class >> defaultSpec [
 	<spec>
 
@@ -28,7 +29,7 @@ SpKeymapPresenter class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #'system menu' }
+{ #category : 'system menu' }
 SpKeymapPresenter class >> keymapBrowserMenuOn: aBuilder [ 
 	"Build an entry in system world menu"
 	<worldMenu>
@@ -41,20 +42,20 @@ SpKeymapPresenter class >> keymapBrowserMenuOn: aBuilder [
 		help: 'List all know shortcuts and Keymapping categories.'
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 SpKeymapPresenter class >> open [
 	<script>
 	
 	self new openWithSpec
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpKeymapPresenter class >> taskbarIconName [
 
 	^ #keymapBrowserIcon
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 SpKeymapPresenter >> browseDefinitionOfSelectedShortcut [
 	| selection action class selector |
 	selection := self keymapTable selection selectedItem ifNil: [ ^ self ].
@@ -67,25 +68,25 @@ SpKeymapPresenter >> browseDefinitionOfSelectedShortcut [
 		highlight: selection shortcutName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpKeymapPresenter >> clearFilterButton [
 
 	^ clearFilterButton
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpKeymapPresenter >> clearFilterButton: anObject [
 
 	clearFilterButton := anObject
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 SpKeymapPresenter >> collectAllShortcuts [
 
 	self keymapTable items: self shortcuts
 ]
 
-{ #category : #'private - initialization' }
+{ #category : 'private - initialization' }
 SpKeymapPresenter >> connectPresenters [
 
 	filterField
@@ -95,7 +96,7 @@ SpKeymapPresenter >> connectPresenters [
 	clearFilterButton action: [ filterField text: '' ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 SpKeymapPresenter >> contextMenu [
 	| hasSelection |
 	
@@ -120,19 +121,19 @@ SpKeymapPresenter >> contextMenu [
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpKeymapPresenter >> filterField [
 
 	^ filterField
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpKeymapPresenter >> filterField: anObject [
 
 	filterField := anObject
 ]
 
-{ #category : #'private - initialization' }
+{ #category : 'private - initialization' }
 SpKeymapPresenter >> initFilter [
 
 	filterField := self newTextInput.
@@ -148,7 +149,7 @@ SpKeymapPresenter >> initFilter [
 		enabled: false
 ]
 
-{ #category : #'private - initialization' }
+{ #category : 'private - initialization' }
 SpKeymapPresenter >> initKeyMapTable [
 
 	keymapTable := self newTable.
@@ -160,13 +161,13 @@ SpKeymapPresenter >> initKeyMapTable [
 		contextMenu: [ self contextMenu ]
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpKeymapPresenter >> initialExtent [
 
 	^ 600 @ 300
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 SpKeymapPresenter >> initializePresenters [
 
 	self 
@@ -176,7 +177,7 @@ SpKeymapPresenter >> initializePresenters [
 	self collectAllShortcuts
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 SpKeymapPresenter >> inspectActionOfSelectedShortcut [
 	| selection action |
 	selection := self keymapTable selection selectedItem ifNil: [ ^ self ].
@@ -184,19 +185,19 @@ SpKeymapPresenter >> inspectActionOfSelectedShortcut [
 	action inspect
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpKeymapPresenter >> keymapTable [
 
 	^ keymapTable
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpKeymapPresenter >> keymapTable: anObject [
 
 	keymapTable := anObject
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 SpKeymapPresenter >> menu: aMenu shifted: aBoolean [
 	(aMenu add: 'Refresh' target: self selector: #collectAllShortcuts)
 		icon: (self iconNamed: #smallUpdateIcon).
@@ -214,7 +215,7 @@ SpKeymapPresenter >> menu: aMenu shifted: aBoolean [
 	^ aMenu
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 SpKeymapPresenter >> setFilter: aFilterText [
 	aFilterText
 		ifEmpty: [ self collectAllShortcuts ]
@@ -223,7 +224,7 @@ SpKeymapPresenter >> setFilter: aFilterText [
 				items: (self shortcuts select: [ :shortcut | {shortcut realValue shortcut asString . shortcut shortcutName . shortcut categoryName} anySatisfy: [ :s | s includesSubstring: filter caseSensitive: false ] ]) ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 SpKeymapPresenter >> shortcuts [
 	| collection |
 	collection := OrderedCollection new.
@@ -240,7 +241,7 @@ SpKeymapPresenter >> shortcuts [
 	^ collection sorted: #categoryName ascending
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpKeymapPresenter >> title [
 	^ 'Keymap Browser'
 ]
diff --git a/src/NewTools-KeymapBrowser/package.st b/src/NewTools-KeymapBrowser/package.st
index 20f0c7b42..c84a533ad 100644
--- a/src/NewTools-KeymapBrowser/package.st
+++ b/src/NewTools-KeymapBrowser/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-KeymapBrowser' }
+Package { #name : 'NewTools-KeymapBrowser' }
diff --git a/src/NewTools-Morphic-Spotter/StSpotterStyleContributor.class.st b/src/NewTools-Morphic-Spotter/StSpotterStyleContributor.class.st
index 6cf734fff..ce4b8b5a3 100644
--- a/src/NewTools-Morphic-Spotter/StSpotterStyleContributor.class.st
+++ b/src/NewTools-Morphic-Spotter/StSpotterStyleContributor.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StSpotterStyleContributor,
-	#superclass : #StPharoStyleContributor,
-	#category : #'NewTools-Morphic-Spotter'
+	#name : 'StSpotterStyleContributor',
+	#superclass : 'StPharoStyleContributor',
+	#category : 'NewTools-Morphic-Spotter',
+	#package : 'NewTools-Morphic-Spotter'
 }
 
-{ #category : #styles }
+{ #category : 'styles' }
 StSpotterStyleContributor >> styleSheetContribution [
 	
 	^ SpStyle newApplication 
diff --git a/src/NewTools-Morphic-Spotter/package.st b/src/NewTools-Morphic-Spotter/package.st
index b483752f9..2e91d0898 100644
--- a/src/NewTools-Morphic-Spotter/package.st
+++ b/src/NewTools-Morphic-Spotter/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Morphic-Spotter' }
+Package { #name : 'NewTools-Morphic-Spotter' }
diff --git a/src/NewTools-Morphic/Morph.extension.st b/src/NewTools-Morphic/Morph.extension.st
index 30364af47..d0cb583a7 100644
--- a/src/NewTools-Morphic/Morph.extension.st
+++ b/src/NewTools-Morphic/Morph.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #Morph }
+Extension { #name : 'Morph' }
 
-{ #category : #'*NewTools-Morphic' }
+{ #category : '*NewTools-Morphic' }
 Morph >> inspectionLayout [
 	<inspectorPresentationOrder: 800 title: 'Layout'>
 	
@@ -31,7 +31,7 @@ Morph >> inspectionLayout [
 		yourself
 ]
 
-{ #category : #'*NewTools-Morphic' }
+{ #category : '*NewTools-Morphic' }
 Morph >> inspectionMorph [
 	<inspectorPresentationOrder: 90 title: 'Morph'>
 
@@ -40,7 +40,7 @@ Morph >> inspectionMorph [
 		yourself
 ]
 
-{ #category : #'*NewTools-Morphic' }
+{ #category : '*NewTools-Morphic' }
 Morph >> inspectorIconName [
 
 	^ self class systemIconName
diff --git a/src/NewTools-Morphic/StPharoApplication.extension.st b/src/NewTools-Morphic/StPharoApplication.extension.st
index ac5ae1d67..5457e81d0 100644
--- a/src/NewTools-Morphic/StPharoApplication.extension.st
+++ b/src/NewTools-Morphic/StPharoApplication.extension.st
@@ -1,12 +1,12 @@
-Extension { #name : #StPharoApplication }
+Extension { #name : 'StPharoApplication' }
 
-{ #category : #'*NewTools-Morphic' }
+{ #category : '*NewTools-Morphic' }
 StPharoApplication >> defaultConfigurationForMorphic [
 
 	^ StPharoMorphicConfiguration new
 ]
 
-{ #category : #'*NewTools-Morphic' }
+{ #category : '*NewTools-Morphic' }
 StPharoApplication >> useMorphic [
 
 	self
diff --git a/src/NewTools-Morphic/StPharoMorphicConfiguration.class.st b/src/NewTools-Morphic/StPharoMorphicConfiguration.class.st
index a9a5b0720..5fde10353 100644
--- a/src/NewTools-Morphic/StPharoMorphicConfiguration.class.st
+++ b/src/NewTools-Morphic/StPharoMorphicConfiguration.class.st
@@ -1,37 +1,38 @@
 Class {
-	#name : #StPharoMorphicConfiguration,
-	#superclass : #SpMorphicConfiguration,
-	#category : #'NewTools-Morphic'
+	#name : 'StPharoMorphicConfiguration',
+	#superclass : 'SpMorphicConfiguration',
+	#category : 'NewTools-Morphic',
+	#package : 'NewTools-Morphic'
 }
 
-{ #category : #defaults }
+{ #category : 'defaults' }
 StPharoMorphicConfiguration class >> defaultStyleSheet [
 
 	^ SpStyle defaultStyleSheet
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 StPharoMorphicConfiguration >> configure: anApplication [
 
 	super configure: anApplication
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 StPharoMorphicConfiguration >> configureOSX: anApplication [
 	
 	self addStyleSheet: self styleSheetOSX
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 StPharoMorphicConfiguration >> configureUnix: anApplication [
 	
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 StPharoMorphicConfiguration >> configureWindows: anApplication [
 ]
 
-{ #category : #'private - factory' }
+{ #category : 'private - factory' }
 StPharoMorphicConfiguration >> newStyleSheet [
 	
 	^ StPharoStyleContributor availableContributors 
@@ -39,14 +40,14 @@ StPharoMorphicConfiguration >> newStyleSheet [
 		into: [ :accum :each | accum, (each styleSheetContribution) ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPharoMorphicConfiguration >> reset [
 
 	SpStyle reset.
 	styleSheet := self newStyleSheet
 ]
 
-{ #category : #styling }
+{ #category : 'styling' }
 StPharoMorphicConfiguration >> styleSheetOSX [
 	"Just an example on how to build styles programatically ;)"
 
diff --git a/src/NewTools-Morphic/StPharoStyleContributor.class.st b/src/NewTools-Morphic/StPharoStyleContributor.class.st
index 20a232ccf..b2c566c7f 100644
--- a/src/NewTools-Morphic/StPharoStyleContributor.class.st
+++ b/src/NewTools-Morphic/StPharoStyleContributor.class.st
@@ -5,12 +5,13 @@ Subclasses of it should implement #styleSheetContribution returning a StyleSheet
 Also subclasses are able to extend the #isApplicable method in the class side and decide to apply or not in different scenarios (e.g., different Operating Systems)
 "
 Class {
-	#name : #StPharoStyleContributor,
-	#superclass : #Object,
-	#category : #'NewTools-Morphic'
+	#name : 'StPharoStyleContributor',
+	#superclass : 'Object',
+	#category : 'NewTools-Morphic',
+	#package : 'NewTools-Morphic'
 }
 
-{ #category : #api }
+{ #category : 'api' }
 StPharoStyleContributor class >> availableContributors [
 
 	^ self allSubclasses
@@ -18,13 +19,13 @@ StPharoStyleContributor class >> availableContributors [
 		thenCollect: [ :each | each new ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StPharoStyleContributor class >> isApplicable [ 
 
 	^ true
 ]
 
-{ #category : #styles }
+{ #category : 'styles' }
 StPharoStyleContributor >> styleSheetContribution [
 	
 	^ self subclassResponsibility
diff --git a/src/NewTools-Morphic/package.st b/src/NewTools-Morphic/package.st
index 1f775370b..b58669729 100644
--- a/src/NewTools-Morphic/package.st
+++ b/src/NewTools-Morphic/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Morphic' }
+Package { #name : 'NewTools-Morphic' }
diff --git a/src/NewTools-ObjectCentricBreakpoints/Object.extension.st b/src/NewTools-ObjectCentricBreakpoints/Object.extension.st
index de58579b1..8d586f31e 100644
--- a/src/NewTools-ObjectCentricBreakpoints/Object.extension.st
+++ b/src/NewTools-ObjectCentricBreakpoints/Object.extension.st
@@ -1,13 +1,13 @@
-Extension { #name : #Object }
+Extension { #name : 'Object' }
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 Object >> haltOnAccess: access [
 	access = #read ifTrue:[^self haltOnRead].
 	access = #write ifTrue:[^self haltOnWrite].
 	^self haltOnAccess
 ]
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 Object >> haltOnAccess: access to: anInstVarName [
 	access = #read ifTrue:[^self haltOnReadTo: anInstVarName].
 	access = #write ifTrue:[^self haltOnWriteTo: anInstVarName].
diff --git a/src/NewTools-ObjectCentricBreakpoints/StBreakpointCommand.class.st b/src/NewTools-ObjectCentricBreakpoints/StBreakpointCommand.class.st
index 4af166466..3b5df4c49 100644
--- a/src/NewTools-ObjectCentricBreakpoints/StBreakpointCommand.class.st
+++ b/src/NewTools-ObjectCentricBreakpoints/StBreakpointCommand.class.st
@@ -1,17 +1,18 @@
 Class {
-	#name : #StBreakpointCommand,
-	#superclass : #CmCommand,
-	#category : #'NewTools-ObjectCentricBreakpoints'
+	#name : 'StBreakpointCommand',
+	#superclass : 'CmCommand',
+	#category : 'NewTools-ObjectCentricBreakpoints',
+	#package : 'NewTools-ObjectCentricBreakpoints'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StBreakpointCommand >> appliesTo: aTool [
 	^ [ aTool owner class ~= StDebuggerRawObjectInspector ]
 		on: Error
 		do: [ false ]
 ]
 
-{ #category : #converting }
+{ #category : 'converting' }
 StBreakpointCommand >> asSpecCommand [
 	| command |
 
@@ -22,7 +23,7 @@ StBreakpointCommand >> asSpecCommand [
 	^ command
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StBreakpointCommand >> canBeExecuted [
 
 	^ context enableSlotMenuEntries
diff --git a/src/NewTools-ObjectCentricBreakpoints/StHaltOnCallCommand.class.st b/src/NewTools-ObjectCentricBreakpoints/StHaltOnCallCommand.class.st
index dccdb5358..5063803a9 100644
--- a/src/NewTools-ObjectCentricBreakpoints/StHaltOnCallCommand.class.st
+++ b/src/NewTools-ObjectCentricBreakpoints/StHaltOnCallCommand.class.st
@@ -1,34 +1,35 @@
 Class {
-	#name : #StHaltOnCallCommand,
-	#superclass : #StBreakpointCommand,
-	#category : #'NewTools-ObjectCentricBreakpoints'
+	#name : 'StHaltOnCallCommand',
+	#superclass : 'StBreakpointCommand',
+	#category : 'NewTools-ObjectCentricBreakpoints',
+	#package : 'NewTools-ObjectCentricBreakpoints'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StHaltOnCallCommand class >> defaultDescription [
 
 	^ 'Halts when this method is called'
 ]
 
-{ #category : #deafult }
+{ #category : 'deafult' }
 StHaltOnCallCommand class >> defaultIconName [
 
 	^ #smallDebug
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StHaltOnCallCommand class >> defaultName [ 
 
 	^ 'Halt on call'
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StHaltOnCallCommand >> canBeExecuted [
 
 	^ self appliesTo: context
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StHaltOnCallCommand >> execute [
 
 	^ context haltInspectedObjectOnCallToSelectedMethod
diff --git a/src/NewTools-ObjectCentricBreakpoints/StHaltOnReadCommand.class.st b/src/NewTools-ObjectCentricBreakpoints/StHaltOnReadCommand.class.st
index 162639464..0d844ba6a 100644
--- a/src/NewTools-ObjectCentricBreakpoints/StHaltOnReadCommand.class.st
+++ b/src/NewTools-ObjectCentricBreakpoints/StHaltOnReadCommand.class.st
@@ -1,28 +1,29 @@
 Class {
-	#name : #StHaltOnReadCommand,
-	#superclass : #StBreakpointCommand,
-	#category : #'NewTools-ObjectCentricBreakpoints'
+	#name : 'StHaltOnReadCommand',
+	#superclass : 'StBreakpointCommand',
+	#category : 'NewTools-ObjectCentricBreakpoints',
+	#package : 'NewTools-ObjectCentricBreakpoints'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StHaltOnReadCommand class >> defaultDescription [
 
 	^ 'Halts when the selected or any variable is read'
 ]
 
-{ #category : #deafult }
+{ #category : 'deafult' }
 StHaltOnReadCommand class >> defaultIconName [
 
 	^ #smallObjects
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StHaltOnReadCommand class >> defaultName [ 
 
 	^ 'Halt on read'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StHaltOnReadCommand >> execute [
 	^context haltInspectedObjectOnReadAccess
 ]
diff --git a/src/NewTools-ObjectCentricBreakpoints/StHaltOnStateAccessCommand.class.st b/src/NewTools-ObjectCentricBreakpoints/StHaltOnStateAccessCommand.class.st
index f55b4fcfb..11c72f21f 100644
--- a/src/NewTools-ObjectCentricBreakpoints/StHaltOnStateAccessCommand.class.st
+++ b/src/NewTools-ObjectCentricBreakpoints/StHaltOnStateAccessCommand.class.st
@@ -1,28 +1,29 @@
 Class {
-	#name : #StHaltOnStateAccessCommand,
-	#superclass : #StBreakpointCommand,
-	#category : #'NewTools-ObjectCentricBreakpoints'
+	#name : 'StHaltOnStateAccessCommand',
+	#superclass : 'StBreakpointCommand',
+	#category : 'NewTools-ObjectCentricBreakpoints',
+	#package : 'NewTools-ObjectCentricBreakpoints'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StHaltOnStateAccessCommand class >> defaultDescription [
 
 	^ 'Halts when the selected or any variable is read or written'
 ]
 
-{ #category : #deafult }
+{ #category : 'deafult' }
 StHaltOnStateAccessCommand class >> defaultIconName [
 
 	^ #smallObjects
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StHaltOnStateAccessCommand class >> defaultName [ 
 
 	^ 'Halt on state access'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StHaltOnStateAccessCommand >> execute [
 	^context haltInspectedObjectOnStateAccess
 ]
diff --git a/src/NewTools-ObjectCentricBreakpoints/StHaltOnWriteCommand.class.st b/src/NewTools-ObjectCentricBreakpoints/StHaltOnWriteCommand.class.st
index f0d78b044..be9fd8f38 100644
--- a/src/NewTools-ObjectCentricBreakpoints/StHaltOnWriteCommand.class.st
+++ b/src/NewTools-ObjectCentricBreakpoints/StHaltOnWriteCommand.class.st
@@ -1,28 +1,29 @@
 Class {
-	#name : #StHaltOnWriteCommand,
-	#superclass : #StBreakpointCommand,
-	#category : #'NewTools-ObjectCentricBreakpoints'
+	#name : 'StHaltOnWriteCommand',
+	#superclass : 'StBreakpointCommand',
+	#category : 'NewTools-ObjectCentricBreakpoints',
+	#package : 'NewTools-ObjectCentricBreakpoints'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StHaltOnWriteCommand class >> defaultDescription [
 
 	^ 'Halts when the selected or any variable is written'
 ]
 
-{ #category : #deafult }
+{ #category : 'deafult' }
 StHaltOnWriteCommand class >> defaultIconName [
 
 	^ #smallObjects
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StHaltOnWriteCommand class >> defaultName [ 
 
 	^ 'Halt on write'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StHaltOnWriteCommand >> execute [
 	^context haltInspectedObjectOnWriteAccess
 ]
diff --git a/src/NewTools-ObjectCentricBreakpoints/StMetaBrowserPresenter.extension.st b/src/NewTools-ObjectCentricBreakpoints/StMetaBrowserPresenter.extension.st
index 2a7f43a0c..b430efd7a 100644
--- a/src/NewTools-ObjectCentricBreakpoints/StMetaBrowserPresenter.extension.st
+++ b/src/NewTools-ObjectCentricBreakpoints/StMetaBrowserPresenter.extension.st
@@ -1,13 +1,13 @@
-Extension { #name : #StMetaBrowserPresenter }
+Extension { #name : 'StMetaBrowserPresenter' }
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StMetaBrowserPresenter >> haltInspectedObjectOnCallToSelectedMethod [
 	|method|
 	method := self selectedMethod ifNil:[^self].
 	self model haltOnCallTo: method selector
 ]
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StMetaBrowserPresenter class >> objectCentricBreakpointCommandsWith: presenter forRootGroup: aRootCmCommandsGroup [
 	<extensionCommands>
 	
diff --git a/src/NewTools-ObjectCentricBreakpoints/StObjectBreakpointInspection.extension.st b/src/NewTools-ObjectCentricBreakpoints/StObjectBreakpointInspection.extension.st
index 056a98f97..c1beda465 100644
--- a/src/NewTools-ObjectCentricBreakpoints/StObjectBreakpointInspection.extension.st
+++ b/src/NewTools-ObjectCentricBreakpoints/StObjectBreakpointInspection.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #StObjectBreakpointInspection }
+Extension { #name : 'StObjectBreakpointInspection' }
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StObjectBreakpointInspection class >> browseBreakpointMethodCommandFor: presenter [
 
 	^ ((SpBrowseClassCommand forContext: presenter)
@@ -10,7 +10,7 @@ StObjectBreakpointInspection class >> browseBreakpointMethodCommandFor: presente
 			yourself
 ]
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StObjectBreakpointInspection class >> objectCentricCommandsWith: presenter forRootGroup: aCmCommandsGroup [
 	<extensionCommands>
 	
@@ -19,7 +19,7 @@ StObjectBreakpointInspection class >> objectCentricCommandsWith: presenter forRo
 		register: (self browseBreakpointMethodCommandFor: presenter)
 ]
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StObjectBreakpointInspection class >> removeBreakpointCommandFor: presenter [
 	| cmd |
 	cmd := StRemoveBreakpointCommand forSpecContext: presenter.
diff --git a/src/NewTools-ObjectCentricBreakpoints/StObjectInspectorPresenter.extension.st b/src/NewTools-ObjectCentricBreakpoints/StObjectInspectorPresenter.extension.st
index 3f7744145..337cf301c 100644
--- a/src/NewTools-ObjectCentricBreakpoints/StObjectInspectorPresenter.extension.st
+++ b/src/NewTools-ObjectCentricBreakpoints/StObjectInspectorPresenter.extension.st
@@ -1,21 +1,21 @@
-Extension { #name : #StObjectInspectorPresenter }
+Extension { #name : 'StObjectInspectorPresenter' }
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StObjectInspectorPresenter >> haltInspectedObjectOnReadAccess [
 	^self inspectedObject haltOnRead
 ]
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StObjectInspectorPresenter >> haltInspectedObjectOnStateAccess [
 	^ self inspectedObject haltOnAccess 
 ]
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StObjectInspectorPresenter >> haltInspectedObjectOnWriteAccess [
 	^ self inspectedObject haltOnWrite
 ]
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StObjectInspectorPresenter class >> objectCentricBreakpointCommandsWith: aPresenter forRootGroup: aRootCommandsGroup [
 	<extensionCommands>
 	
diff --git a/src/NewTools-ObjectCentricBreakpoints/StRawInspectionPresenter.extension.st b/src/NewTools-ObjectCentricBreakpoints/StRawInspectionPresenter.extension.st
index af2179564..ca722161e 100644
--- a/src/NewTools-ObjectCentricBreakpoints/StRawInspectionPresenter.extension.st
+++ b/src/NewTools-ObjectCentricBreakpoints/StRawInspectionPresenter.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #StRawInspectionPresenter }
+Extension { #name : 'StRawInspectionPresenter' }
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StRawInspectionPresenter >> haltInspectedObjectOnAccess: access [
 	| selectedItem |
 	selectedItem := self selectedItem.
@@ -14,22 +14,22 @@ StRawInspectionPresenter >> haltInspectedObjectOnAccess: access [
 	^ self model haltOnAccess: access to: selectedItem key
 ]
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StRawInspectionPresenter >> haltInspectedObjectOnReadAccess [
 	^self haltInspectedObjectOnAccess: #read
 ]
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StRawInspectionPresenter >> haltInspectedObjectOnStateAccess [
 	^ self haltInspectedObjectOnAccess: #all
 ]
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StRawInspectionPresenter >> haltInspectedObjectOnWriteAccess [
 	^ self haltInspectedObjectOnAccess: #write
 ]
 
-{ #category : #'*NewTools-ObjectCentricBreakpoints' }
+{ #category : '*NewTools-ObjectCentricBreakpoints' }
 StRawInspectionPresenter class >> objectCentricBreakpointCommandsWith: presenter forRootGroup: aRootCmCommandsGroup [
 	<extensionCommands>
 	({StHaltOnReadCommand forSpec.
diff --git a/src/NewTools-ObjectCentricBreakpoints/package.st b/src/NewTools-ObjectCentricBreakpoints/package.st
index cd15fb0a7..8ec9478ef 100644
--- a/src/NewTools-ObjectCentricBreakpoints/package.st
+++ b/src/NewTools-ObjectCentricBreakpoints/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-ObjectCentricBreakpoints' }
+Package { #name : 'NewTools-ObjectCentricBreakpoints' }
diff --git a/src/NewTools-Playground-Tests/StPlaygroundBaseTest.class.st b/src/NewTools-Playground-Tests/StPlaygroundBaseTest.class.st
index c9aad302b..c2a245735 100644
--- a/src/NewTools-Playground-Tests/StPlaygroundBaseTest.class.st
+++ b/src/NewTools-Playground-Tests/StPlaygroundBaseTest.class.st
@@ -1,42 +1,43 @@
 Class {
-	#name : #StPlaygroundBaseTest,
-	#superclass : #TestCase,
+	#name : 'StPlaygroundBaseTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'backendForTest',
 		'application',
 		'presenter',
 		'memoryFileSystem'
 	],
-	#category : #'NewTools-Playground-Tests'
+	#category : 'NewTools-Playground-Tests',
+	#package : 'NewTools-Playground-Tests'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StPlaygroundBaseTest class >> isAbstract [
 
 	^ super isAbstract or: [ self = StPlaygroundBaseTest ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundBaseTest >> classToTest [
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StPlaygroundBaseTest >> initializeInstance: aPresenter [
 	
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StPlaygroundBaseTest >> initializeInstanceBeforeInitialization: aPresenter [
 	
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StPlaygroundBaseTest >> initializeMemoryFileSystem: aFileSystem [
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StPlaygroundBaseTest >> newPage [ 
 
 	^ StPlaygroundPage new 
@@ -45,13 +46,13 @@ StPlaygroundBaseTest >> newPage [
 		yourself
 ]
 
-{ #category : #'private - utilities' }
+{ #category : 'private - utilities' }
 StPlaygroundBaseTest >> openInstance [
 
 	presenter open
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StPlaygroundBaseTest >> setUp [
 	super setUp.
 	
@@ -68,21 +69,21 @@ StPlaygroundBaseTest >> setUp [
 	self initializeInstance: presenter
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StPlaygroundBaseTest >> tearDown [
 
 	presenter withWindowDo: [ :window | window close ].
 	super tearDown
 ]
 
-{ #category : #'private - utilities' }
+{ #category : 'private - utilities' }
 StPlaygroundBaseTest >> waitUntilContentsAreFlush [
 		
 	20 milliSeconds wait
 	
 ]
 
-{ #category : #'private - utilities' }
+{ #category : 'private - utilities' }
 StPlaygroundBaseTest >> waitUntilUIRedrawed [
 
 	backendForTest waitUntilUIRedrawed
diff --git a/src/NewTools-Playground-Tests/StPlaygroundInteractionModelTest.class.st b/src/NewTools-Playground-Tests/StPlaygroundInteractionModelTest.class.st
index d40d8f182..2f7c67e11 100644
--- a/src/NewTools-Playground-Tests/StPlaygroundInteractionModelTest.class.st
+++ b/src/NewTools-Playground-Tests/StPlaygroundInteractionModelTest.class.st
@@ -1,13 +1,14 @@
 Class {
-	#name : #StPlaygroundInteractionModelTest,
-	#superclass : #SpCodeScriptingInteractionModelTest,
+	#name : 'StPlaygroundInteractionModelTest',
+	#superclass : 'SpCodeScriptingInteractionModelTest',
 	#instVars : [
 		'application'
 	],
-	#category : #'NewTools-Playground-Tests'
+	#category : 'NewTools-Playground-Tests',
+	#package : 'NewTools-Playground-Tests'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StPlaygroundInteractionModelTest >> newInteractionModel [
 
 	^ StPlaygroundInteractionModel new
@@ -17,14 +18,14 @@ StPlaygroundInteractionModelTest >> newInteractionModel [
 		yourself
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StPlaygroundInteractionModelTest >> setUp [
 	super setUp.
 	
 	application := StPharoApplication new.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundInteractionModelTest >> testMakeBindingLocal [
 	| im1 im2 binding |
 	
@@ -44,7 +45,7 @@ StPlaygroundInteractionModelTest >> testMakeBindingLocal [
 	self deny: (im2 hasBindingOf: #testBinding)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundInteractionModelTest >> testMakeBindingShared [
 	| im1 im2 binding |
 	
diff --git a/src/NewTools-Playground-Tests/StPlaygroundPagePresenterTest.class.st b/src/NewTools-Playground-Tests/StPlaygroundPagePresenterTest.class.st
index 5405766a3..387ccd0b5 100644
--- a/src/NewTools-Playground-Tests/StPlaygroundPagePresenterTest.class.st
+++ b/src/NewTools-Playground-Tests/StPlaygroundPagePresenterTest.class.st
@@ -1,31 +1,32 @@
 Class {
-	#name : #StPlaygroundPagePresenterTest,
-	#superclass : #StPlaygroundBaseTest,
+	#name : 'StPlaygroundPagePresenterTest',
+	#superclass : 'StPlaygroundBaseTest',
 	#instVars : [
 		'classFactory'
 	],
-	#category : #'NewTools-Playground-Tests'
+	#category : 'NewTools-Playground-Tests',
+	#package : 'NewTools-Playground-Tests'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagePresenterTest >> classFactory [
 
 	^ classFactory ifNil: [ classFactory := ClassFactoryForTestCase new ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagePresenterTest >> classToTest [
 
 	^ StPlaygroundPagePresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagePresenterTest >> initializeInstanceBeforeInitialization: aPresenter [
 
 	aPresenter setModelBeforeInitialization: self newPage
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StPlaygroundPagePresenterTest >> tearDown [
 
 	classFactory ifNotNil: [ 
@@ -34,7 +35,7 @@ StPlaygroundPagePresenterTest >> tearDown [
 	super tearDown
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPagePresenterTest >> testAddMenuCommandsTo [
 
 	| group commands class |
@@ -46,7 +47,7 @@ StPlaygroundPagePresenterTest >> testAddMenuCommandsTo [
 	self assert: (commands includes: class)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPagePresenterTest >> testAddToolbarCommandsTo [
 
 	| group commands class |
@@ -58,7 +59,7 @@ StPlaygroundPagePresenterTest >> testAddToolbarCommandsTo [
 	self assert: (commands includes: class)
 ]
 
-{ #category : #'tests - commands' }
+{ #category : 'tests - commands' }
 StPlaygroundPagePresenterTest >> testDoEvaluateAllAndGo [
 	| value |
 	
@@ -73,7 +74,7 @@ StPlaygroundPagePresenterTest >> testDoEvaluateAllAndGo [
 		equals:  1405006117752879898543142606244511569936384000000000
 ]
 
-{ #category : #'tests - commands' }
+{ #category : 'tests - commands' }
 StPlaygroundPagePresenterTest >> testDoEvaluateAndGo [
 	| value |
 	
@@ -95,7 +96,7 @@ StPlaygroundPagePresenterTest >> testDoEvaluateAndGo [
 		equals:  1405006117752879898543142606244511569936384000000000
 ]
 
-{ #category : #'tests - commands' }
+{ #category : 'tests - commands' }
 StPlaygroundPagePresenterTest >> testDoEvaluateDeclareGlobal [
 	| value |
 
@@ -117,7 +118,7 @@ StPlaygroundPagePresenterTest >> testDoEvaluateDeclareGlobal [
 	Smalltalk globals removeKey: #MyGlobalForTest
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPagePresenterTest >> testPageIsSavedWhenExecutingACommand [
 	| memory fileReference |
 	
@@ -144,7 +145,7 @@ StPlaygroundPagePresenterTest >> testPageIsSavedWhenExecutingACommand [
 		equals: '42 factorial'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPagePresenterTest >> testToolbarActions [
 
 	| group commands class |
diff --git a/src/NewTools-Playground-Tests/StPlaygroundPageSummaryPresenterTest.class.st b/src/NewTools-Playground-Tests/StPlaygroundPageSummaryPresenterTest.class.st
index 0d8f7d30d..4a25d258c 100644
--- a/src/NewTools-Playground-Tests/StPlaygroundPageSummaryPresenterTest.class.st
+++ b/src/NewTools-Playground-Tests/StPlaygroundPageSummaryPresenterTest.class.st
@@ -1,22 +1,23 @@
 Class {
-	#name : #StPlaygroundPageSummaryPresenterTest,
-	#superclass : #StPlaygroundBaseTest,
-	#category : #'NewTools-Playground-Tests'
+	#name : 'StPlaygroundPageSummaryPresenterTest',
+	#superclass : 'StPlaygroundBaseTest',
+	#category : 'NewTools-Playground-Tests',
+	#package : 'NewTools-Playground-Tests'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPageSummaryPresenterTest >> classToTest [
 
 	^ StPlaygroundPageSummaryPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPageSummaryPresenterTest >> initializeInstanceBeforeInitialization: aPresenter [
 
 	aPresenter setModelBeforeInitialization: memoryFileSystem / 'test1.ph'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPageSummaryPresenterTest >> initializeMemoryFileSystem: aFileSystem [
 
 	aFileSystem / 'test1.ph' writeStreamDo: [ :stream | stream << '' ].
@@ -25,7 +26,7 @@ StPlaygroundPageSummaryPresenterTest >> initializeMemoryFileSystem: aFileSystem
 		stream << 'Test 2' ].
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPageSummaryPresenterTest >> testContents [
 
 	self assert: presenter contents equals: ''.
@@ -34,7 +35,7 @@ StPlaygroundPageSummaryPresenterTest >> testContents [
 Test 2'	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPageSummaryPresenterTest >> testPageFirstLine [
 	
 	self assert: presenter pageFirstLine equals: 'Empty'.	
diff --git a/src/NewTools-Playground-Tests/StPlaygroundPageTest.class.st b/src/NewTools-Playground-Tests/StPlaygroundPageTest.class.st
index 04dcf0f4a..110fe5e39 100644
--- a/src/NewTools-Playground-Tests/StPlaygroundPageTest.class.st
+++ b/src/NewTools-Playground-Tests/StPlaygroundPageTest.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StPlaygroundPageTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-Playground-Tests'
+	#name : 'StPlaygroundPageTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-Playground-Tests',
+	#package : 'NewTools-Playground-Tests'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StPlaygroundPageTest >> newPage [ 
 
 	^ StPlaygroundPage new 
@@ -13,7 +14,7 @@ StPlaygroundPageTest >> newPage [
 		yourself
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPageTest >> testContents [
 	| page waitMock |
 	
@@ -30,7 +31,7 @@ StPlaygroundPageTest >> testContents [
 	self assert: page contents equals: 'test 2'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPageTest >> testDoNotStoreVersionIfEqual [
 	| v1 page |
 	
@@ -45,7 +46,7 @@ StPlaygroundPageTest >> testDoNotStoreVersionIfEqual [
 	self assert: page versions size equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPageTest >> testFlush [
 	| page |
 	
@@ -62,7 +63,7 @@ StPlaygroundPageTest >> testFlush [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPageTest >> testFromReference [
 	| memory file page |
 	
@@ -75,7 +76,7 @@ StPlaygroundPageTest >> testFromReference [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPageTest >> testStoreVersion [
 	| v1 page |
 	
@@ -87,7 +88,7 @@ StPlaygroundPageTest >> testStoreVersion [
 	self assert: page versions first content equals: v1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPageTest >> testVersions [
 	| v1 v2 v3 page |
 	
diff --git a/src/NewTools-Playground-Tests/StPlaygroundPageTestMockedWaitable.class.st b/src/NewTools-Playground-Tests/StPlaygroundPageTestMockedWaitable.class.st
index 39a1f9973..77b6b0aa2 100644
--- a/src/NewTools-Playground-Tests/StPlaygroundPageTestMockedWaitable.class.st
+++ b/src/NewTools-Playground-Tests/StPlaygroundPageTestMockedWaitable.class.st
@@ -5,17 +5,18 @@ When wait is called on this object from a secondary thread (<=IMPORTANT), it wil
 This is essentially a Semaphore, with a built-in timeout and specific for these kind of tests.
 "
 Class {
-	#name : #StPlaygroundPageTestMockedWaitable,
-	#superclass : #Object,
+	#name : 'StPlaygroundPageTestMockedWaitable',
+	#superclass : 'Object',
 	#instVars : [
 		'sem',
 		'sem2',
 		'timeout'
 	],
-	#category : #'NewTools-Playground-Tests'
+	#category : 'NewTools-Playground-Tests',
+	#package : 'NewTools-Playground-Tests'
 }
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPageTestMockedWaitable >> initialize [
 
 	sem := Semaphore new.
@@ -23,20 +24,20 @@ StPlaygroundPageTestMockedWaitable >> initialize [
 	timeout := 500
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPageTestMockedWaitable >> resume [
 
 	sem signal.
 	^ sem2 wait: (Duration milliSeconds: timeout)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPageTestMockedWaitable >> timeout: aNumberMiliseconds [
 
 	timeout := aNumberMiliseconds
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPageTestMockedWaitable >> wait [
 
 	| semRes |
diff --git a/src/NewTools-Playground-Tests/StPlaygroundPagesPresenterTest.class.st b/src/NewTools-Playground-Tests/StPlaygroundPagesPresenterTest.class.st
index ad52f5cb0..e9719fd78 100644
--- a/src/NewTools-Playground-Tests/StPlaygroundPagesPresenterTest.class.st
+++ b/src/NewTools-Playground-Tests/StPlaygroundPagesPresenterTest.class.st
@@ -1,22 +1,23 @@
 Class {
-	#name : #StPlaygroundPagesPresenterTest,
-	#superclass : #StPlaygroundBaseTest,
-	#category : #'NewTools-Playground-Tests'
+	#name : 'StPlaygroundPagesPresenterTest',
+	#superclass : 'StPlaygroundBaseTest',
+	#category : 'NewTools-Playground-Tests',
+	#package : 'NewTools-Playground-Tests'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagesPresenterTest >> classToTest [
 
 	^ StPlaygroundPagesPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagesPresenterTest >> initializeInstanceBeforeInitialization: aPresenter [
 
 	aPresenter setModelBeforeInitialization: (StPlaygroundPresenter newApplication: application)
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagesPresenterTest >> initializeMemoryFileSystem: aFileSystem [
 
 	aFileSystem / 'test1.ph' writeStreamDo: [ :stream | stream << '42 factorial' ].
@@ -25,7 +26,7 @@ StPlaygroundPagesPresenterTest >> initializeMemoryFileSystem: aFileSystem [
 		stream << 'Test 2"' ].
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundPagesPresenterTest >> testLoadPage [
 
 	self deny: presenter window notNil.
diff --git a/src/NewTools-Playground-Tests/StPlaygroundTest.class.st b/src/NewTools-Playground-Tests/StPlaygroundTest.class.st
index 225fb1334..e4a182ed4 100644
--- a/src/NewTools-Playground-Tests/StPlaygroundTest.class.st
+++ b/src/NewTools-Playground-Tests/StPlaygroundTest.class.st
@@ -1,22 +1,23 @@
 Class {
-	#name : #StPlaygroundTest,
-	#superclass : #StPlaygroundBaseTest,
-	#category : #'NewTools-Playground-Tests'
+	#name : 'StPlaygroundTest',
+	#superclass : 'StPlaygroundBaseTest',
+	#category : 'NewTools-Playground-Tests',
+	#package : 'NewTools-Playground-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StPlaygroundTest >> classToTest [
 
 	^ StPlaygroundPresenter
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StPlaygroundTest >> initializeInstanceBeforeInitialization: aPresenter [
 
 	aPresenter setModelBeforeInitialization: self newPage
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StPlaygroundTest >> newPlayground [
 
 	^ StPlaygroundPresenter 
@@ -25,7 +26,7 @@ StPlaygroundTest >> newPlayground [
 		
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundTest >> testContents [
 
 	presenter open.
@@ -35,7 +36,7 @@ StPlaygroundTest >> testContents [
 	self assert: presenter model contents equals: 'Test'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundTest >> testLoadPage [
 
 	| page |
@@ -53,7 +54,7 @@ StPlaygroundTest >> testLoadPage [
 	self assert: presenter page contents equals: page contents
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundTest >> testNewInspectorForWorksWhenModelIsNil [
 	| inspectorPanel |
 
@@ -62,7 +63,7 @@ StPlaygroundTest >> testNewInspectorForWorksWhenModelIsNil [
 	self assert: (inspectorPanel isKindOf: StObjectInspectorPresenter)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPlaygroundTest >> testStopProcessing [
 
 	| page |
diff --git a/src/NewTools-Playground-Tests/package.st b/src/NewTools-Playground-Tests/package.st
index cd5053500..f049aef1e 100644
--- a/src/NewTools-Playground-Tests/package.st
+++ b/src/NewTools-Playground-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Playground-Tests' }
+Package { #name : 'NewTools-Playground-Tests' }
diff --git a/src/NewTools-Playground/StPharoApplication.extension.st b/src/NewTools-Playground/StPharoApplication.extension.st
index ca560efaa..29494babb 100644
--- a/src/NewTools-Playground/StPharoApplication.extension.st
+++ b/src/NewTools-Playground/StPharoApplication.extension.st
@@ -1,18 +1,18 @@
-Extension { #name : #StPharoApplication }
+Extension { #name : 'StPharoApplication' }
 
-{ #category : #'*NewTools-Playground' }
+{ #category : '*NewTools-Playground' }
 StPharoApplication >> addSharedBinding: aBinding [
 	
 	self sharedBindings add: aBinding
 ]
 
-{ #category : #'*NewTools-Playground' }
+{ #category : '*NewTools-Playground' }
 StPharoApplication >> removeSharedBinding: aBinding [
 
 	self sharedBindings removeKey: aBinding key
 ]
 
-{ #category : #'*NewTools-Playground' }
+{ #category : '*NewTools-Playground' }
 StPharoApplication >> sharedBindings [
 	"bindings that are shared by all playgrounds"
 	
diff --git a/src/NewTools-Playground/StPlayground.class.st b/src/NewTools-Playground/StPlayground.class.st
index c1b17b6b1..939cafa7e 100644
--- a/src/NewTools-Playground/StPlayground.class.st
+++ b/src/NewTools-Playground/StPlayground.class.st
@@ -1,10 +1,12 @@
 Class {
-	#name : #StPlayground,
-	#superclass : #StPlaygroundPresenter,
-	#category : #'NewTools-Playground-Deprecated'
+	#name : 'StPlayground',
+	#superclass : 'StPlaygroundPresenter',
+	#category : 'NewTools-Playground-Deprecated',
+	#package : 'NewTools-Playground',
+	#tag : 'Deprecated'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StPlayground class >> isDeprecated [ 
 	
 	^ true
diff --git a/src/NewTools-Playground/StPlaygroundAdoptVersionCommand.class.st b/src/NewTools-Playground/StPlaygroundAdoptVersionCommand.class.st
index 96cd3b812..74edb04c0 100644
--- a/src/NewTools-Playground/StPlaygroundAdoptVersionCommand.class.st
+++ b/src/NewTools-Playground/StPlaygroundAdoptVersionCommand.class.st
@@ -3,24 +3,26 @@ Adopt selected version on current playground.
 This command is to be used on `StPlaygroundPageVersionsPresenter`
 "
 Class {
-	#name : #StPlaygroundAdoptVersionCommand,
-	#superclass : #StPlaygroundCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StPlaygroundAdoptVersionCommand',
+	#superclass : 'StPlaygroundCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StPlaygroundAdoptVersionCommand class >> defaultDescription [
 
 	^ 'Adopt version contents in current playground'
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StPlaygroundAdoptVersionCommand class >> defaultName [
 
 	^ 'Adopt'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StPlaygroundAdoptVersionCommand >> execute [
 
 	self context doAdoptVersion
diff --git a/src/NewTools-Playground/StPlaygroundAdoptVersionOnNewPlaygroundCommand.class.st b/src/NewTools-Playground/StPlaygroundAdoptVersionOnNewPlaygroundCommand.class.st
index c1c72c9b3..28e15191a 100644
--- a/src/NewTools-Playground/StPlaygroundAdoptVersionOnNewPlaygroundCommand.class.st
+++ b/src/NewTools-Playground/StPlaygroundAdoptVersionOnNewPlaygroundCommand.class.st
@@ -3,24 +3,26 @@ Adopt selected version in a new playground.
 This command is to be used on `StPlaygroundPageVersionsPresenter`
 "
 Class {
-	#name : #StPlaygroundAdoptVersionOnNewPlaygroundCommand,
-	#superclass : #StPlaygroundCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StPlaygroundAdoptVersionOnNewPlaygroundCommand',
+	#superclass : 'StPlaygroundCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundAdoptVersionOnNewPlaygroundCommand class >> defaultDescription [
 
 	^ 'Adopt version contents in new playground'
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundAdoptVersionOnNewPlaygroundCommand class >> defaultName [
 
 	^ 'Adopt on new playground'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StPlaygroundAdoptVersionOnNewPlaygroundCommand >> execute [
 
 	self context doAdoptVersionOnNewPlayground
diff --git a/src/NewTools-Playground/StPlaygroundBindingsCommand.class.st b/src/NewTools-Playground/StPlaygroundBindingsCommand.class.st
index a4812be3a..f2d74f6cc 100644
--- a/src/NewTools-Playground/StPlaygroundBindingsCommand.class.st
+++ b/src/NewTools-Playground/StPlaygroundBindingsCommand.class.st
@@ -2,36 +2,38 @@
 Show the page bindings browser.
 "
 Class {
-	#name : #StPlaygroundBindingsCommand,
-	#superclass : #StPlaygroundCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StPlaygroundBindingsCommand',
+	#superclass : 'StPlaygroundCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundBindingsCommand class >> defaultDescription [
 
 	^ 'Edit bindings list.'
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundBindingsCommand class >> defaultIconName [
 
 	^ #glamorousTable
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundBindingsCommand class >> defaultName [
 
 	^ 'Bindings'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundBindingsCommand class >> order [
 
 	^ 10
 ]
 
-{ #category : #execution }
+{ #category : 'execution' }
 StPlaygroundBindingsCommand >> execute [ 
 
 	(StPlaygroundBindingsPresenter 
diff --git a/src/NewTools-Playground/StPlaygroundBindingsPresenter.class.st b/src/NewTools-Playground/StPlaygroundBindingsPresenter.class.st
index b8c8d2330..0e3b4cffc 100644
--- a/src/NewTools-Playground/StPlaygroundBindingsPresenter.class.st
+++ b/src/NewTools-Playground/StPlaygroundBindingsPresenter.class.st
@@ -4,8 +4,8 @@ I show a list of active bindings.
 A panel to inspect each of the bindings values is shown too.
 "
 Class {
-	#name : #StPlaygroundBindingsPresenter,
-	#superclass : #StPresenter,
+	#name : 'StPlaygroundBindingsPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'bindingList',
 		'inspector',
@@ -13,46 +13,48 @@ Class {
 		'bindingPanel',
 		'inspectorPanel'
 	],
-	#category : #'NewTools-Playground-View'
+	#category : 'NewTools-Playground-View',
+	#package : 'NewTools-Playground',
+	#tag : 'View'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundBindingsPresenter class >> defaultExtent [
 
 	^ (600@400) scaledByDisplayScaleFactor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundBindingsPresenter class >> defaultTitle [
 
 	^ 'Bindings'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundBindingsPresenter class >> emptyMessage [
 
 	^ 'There are no bindings to list.'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundBindingsPresenter class >> unselectedMessage [
 
 	^ 'Select a variable to inspect its value.'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundBindingsPresenter >> bindings [
 
 	^ parent interactionModel bindings
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundBindingsPresenter >> contextMenu [
 
 	^ self contextMenuActions asMenuPresenter
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundBindingsPresenter >> contextMenuActions [
 
 	^ CmCommandGroup forSpec
@@ -66,13 +68,13 @@ StPlaygroundBindingsPresenter >> contextMenuActions [
 		yourself
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundBindingsPresenter >> contextMenuKeyBindings [
 
 	^ self contextMenuActions asKMCategory
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StPlaygroundBindingsPresenter >> defaultLayout [
 
 	^ SpPanedLayout newLeftToRight
@@ -82,13 +84,13 @@ StPlaygroundBindingsPresenter >> defaultLayout [
 		yourself
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StPlaygroundBindingsPresenter >> hasSelectedBinding [
 
 	^ self selectedBinding notNil
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundBindingsPresenter >> initializeDialogWindow: aDialogWindowPresenter [
 
 	aDialogWindowPresenter 
@@ -98,7 +100,7 @@ StPlaygroundBindingsPresenter >> initializeDialogWindow: aDialogWindowPresenter
 			presenter close ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundBindingsPresenter >> initializeInspectorPanel [
 
 	inspectorPanel := (self instantiate: StHeaderPanel)
@@ -122,7 +124,7 @@ StPlaygroundBindingsPresenter >> initializeInspectorPanel [
 	inspectorPanel presenter: inspector
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundBindingsPresenter >> initializeListPanel [
 
 	bindingPanel := (self instantiate: StHeaderPanel)
@@ -148,7 +150,7 @@ StPlaygroundBindingsPresenter >> initializeListPanel [
 	bindingPanel presenter: bindingList
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundBindingsPresenter >> initializePresenters [
 
 	self initializeListPanel.
@@ -158,7 +160,7 @@ StPlaygroundBindingsPresenter >> initializePresenters [
 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundBindingsPresenter >> initializeWindow: aWindowPresenter [
 
 	super initializeWindow: aWindowPresenter.
@@ -167,13 +169,13 @@ StPlaygroundBindingsPresenter >> initializeWindow: aWindowPresenter [
 		initialExtent: self class defaultExtent
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StPlaygroundBindingsPresenter >> isLocalBinding: aBinding [
 
 	^ (self application sharedBindings includesKey: aBinding key) not
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundBindingsPresenter >> moveSelectedBindingToLocalScope [
 	| selection |
 		
@@ -181,7 +183,7 @@ StPlaygroundBindingsPresenter >> moveSelectedBindingToLocalScope [
 	parent interactionModel makeBindingLocal: selection
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundBindingsPresenter >> moveSelectedBindingToSharedScope [
 	| selection |
 		
@@ -189,7 +191,7 @@ StPlaygroundBindingsPresenter >> moveSelectedBindingToSharedScope [
 	parent interactionModel makeBindingShared: selection
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundBindingsPresenter >> newCodeWithTransmissionOn: aBinding [
 	
 	^ self newCode 
@@ -200,7 +202,7 @@ StPlaygroundBindingsPresenter >> newCodeWithTransmissionOn: aBinding [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundBindingsPresenter >> newInspectorWithTransmission: aClass on: aBinding [
 	
 	^ self 
@@ -208,14 +210,14 @@ StPlaygroundBindingsPresenter >> newInspectorWithTransmission: aClass on: aBindi
 		on: aBinding value
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundBindingsPresenter >> removeAllBindings [
 	
 	parent interactionModel removeAllBindings.
 	self updatePresenterKeepingSelection
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundBindingsPresenter >> removeSelectedBinding [
 
 	self selectedBindingIsLocal 
@@ -224,7 +226,7 @@ StPlaygroundBindingsPresenter >> removeSelectedBinding [
 	self updatePresenterKeepingSelection
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundBindingsPresenter >> scopeNameFor: aBinding [
 
 	^ self application sharedBindings
@@ -233,13 +235,13 @@ StPlaygroundBindingsPresenter >> scopeNameFor: aBinding [
 		ifAbsent: [ 'local' ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundBindingsPresenter >> selectedBinding [
 
 	^ bindingList ifNotNil: [ bindingList selection selectedItem ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StPlaygroundBindingsPresenter >> selectedBindingIsLocal [
 	| selection |
 
@@ -249,19 +251,19 @@ StPlaygroundBindingsPresenter >> selectedBindingIsLocal [
 	^ self isLocalBinding: selection
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StPlaygroundBindingsPresenter >> setModelBeforeInitialization: aPlayground [
 
 	parent := aPlayground
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundBindingsPresenter >> sortedBindingAssociations [
 
 	^ self bindings associations sort: [ :a | self isLocalBinding: a ] ascending
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundBindingsPresenter >> title [
 
 	parent withWindowDo: [ :w | 
@@ -269,7 +271,7 @@ StPlaygroundBindingsPresenter >> title [
 	^ self class defaultTitle
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundBindingsPresenter >> toggleSelectedBindingScope [
 
 	self selectedBindingIsLocal 
@@ -278,7 +280,7 @@ StPlaygroundBindingsPresenter >> toggleSelectedBindingScope [
 	self updatePresenterKeepingSelection
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundBindingsPresenter >> toolbarActions [
 
 	^ CmCommandGroup forSpec
@@ -287,14 +289,14 @@ StPlaygroundBindingsPresenter >> toolbarActions [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundBindingsPresenter >> updatePresenter [
 	
 	self updatePresenterWithSelection: [
 		bindingList selectIndex: 1 ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundBindingsPresenter >> updatePresenterKeepingSelection [
 	| selection |
 	
@@ -305,7 +307,7 @@ StPlaygroundBindingsPresenter >> updatePresenterKeepingSelection [
 			ifFalse: [ bindingList items first ]) ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundBindingsPresenter >> updatePresenterWithSelection: aBlock [
 	| newBindings oldBindings |
 
diff --git a/src/NewTools-Playground/StPlaygroundCommand.class.st b/src/NewTools-Playground/StPlaygroundCommand.class.st
index 8f5898b2d..fe8d92a7b 100644
--- a/src/NewTools-Playground/StPlaygroundCommand.class.st
+++ b/src/NewTools-Playground/StPlaygroundCommand.class.st
@@ -2,18 +2,20 @@
 A base command for playground actions (the ones that are specific of the playground).
 "
 Class {
-	#name : #StPlaygroundCommand,
-	#superclass : #StCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StPlaygroundCommand',
+	#superclass : 'StCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StPlaygroundCommand class >> isAbstract [
 
 	^ self == StPlaygroundCommand
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundCommand class >> order [
 
 	^ 100
diff --git a/src/NewTools-Playground/StPlaygroundDoItCommand.class.st b/src/NewTools-Playground/StPlaygroundDoItCommand.class.st
index 4f836c7b5..79d6ffc4a 100644
--- a/src/NewTools-Playground/StPlaygroundDoItCommand.class.st
+++ b/src/NewTools-Playground/StPlaygroundDoItCommand.class.st
@@ -3,36 +3,38 @@ I'm a ""do it and inspect"" command.
 I will select all contents of a playground and I will execute it, inspecting the result.
 "
 Class {
-	#name : #StPlaygroundDoItCommand,
-	#superclass : #StPlaygroundCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StPlaygroundDoItCommand',
+	#superclass : 'StPlaygroundCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundDoItCommand class >> defaultDescription [
 
 	^ 'Do it all and inspect.'
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundDoItCommand class >> defaultIconName [
 
 	^ #glamorousGo
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundDoItCommand class >> defaultName [
 
 	^ 'Do it'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundDoItCommand class >> order [
 
 	^ 0
 ]
 
-{ #category : #execution }
+{ #category : 'execution' }
 StPlaygroundDoItCommand >> execute [ 
 
 	context doEvaluateAllAndGo
diff --git a/src/NewTools-Playground/StPlaygroundInteractionModel.class.st b/src/NewTools-Playground/StPlaygroundInteractionModel.class.st
index 457cc1197..bdf1c7f4e 100644
--- a/src/NewTools-Playground/StPlaygroundInteractionModel.class.st
+++ b/src/NewTools-Playground/StPlaygroundInteractionModel.class.st
@@ -3,12 +3,14 @@ An interaction model to be used in playground contexts.
 It will allow a playground to share variables.
 "
 Class {
-	#name : #StPlaygroundInteractionModel,
-	#superclass : #SpCodeScriptingInteractionModel,
-	#category : #'NewTools-Playground-Model'
+	#name : 'StPlaygroundInteractionModel',
+	#superclass : 'SpCodeScriptingInteractionModel',
+	#category : 'NewTools-Playground-Model',
+	#package : 'NewTools-Playground',
+	#tag : 'Model'
 }
 
-{ #category : #binding }
+{ #category : 'binding' }
 StPlaygroundInteractionModel >> addBinding: aBinding [
 
 	(self isGlobalVariable: aBinding key) ifTrue: [ ^ self ].
@@ -16,19 +18,19 @@ StPlaygroundInteractionModel >> addBinding: aBinding [
 	bindings add: aBinding
 ]
 
-{ #category : #binding }
+{ #category : 'binding' }
 StPlaygroundInteractionModel >> addBindings: aCollection [
 
 	aCollection do: [ :each | self addBinding: each ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundInteractionModel >> application [
 
 	^ self owner application
 ]
 
-{ #category : #binding }
+{ #category : 'binding' }
 StPlaygroundInteractionModel >> bindingOf: aString [
 	| key |
 
@@ -44,7 +46,7 @@ StPlaygroundInteractionModel >> bindingOf: aString [
 	^ self localBindings associationAt: key
 ]
 
-{ #category : #binding }
+{ #category : 'binding' }
 StPlaygroundInteractionModel >> bindings [
 	"Combining shared bindings and local bindings needs to be done like this because the 
 	 #add: method of Dictionary stores the whole association (which in this case is a 
@@ -62,25 +64,25 @@ StPlaygroundInteractionModel >> bindings [
 	^ joinedBindings
 ]
 
-{ #category : #'interactive error protocol' }
+{ #category : 'interactive error protocol' }
 StPlaygroundInteractionModel >> correctFrom: start to: stop with: aString [ 
 	self owner adapter widget correctFrom: start to: stop with: aString 
 ]
 
-{ #category : #binding }
+{ #category : 'binding' }
 StPlaygroundInteractionModel >> hasBindingOf: aString [
 
 	^ (self sharedBindings includesKey: aString asSymbol)
 		or: [ (self localBindings includesKey: aString asSymbol) ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundInteractionModel >> isGlobalVariable: aSymbol [
 
 	^ (self class environment classNamed: aSymbol) notNil
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundInteractionModel >> localBindings [
 	
 	^ super bindings
@@ -88,21 +90,21 @@ StPlaygroundInteractionModel >> localBindings [
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundInteractionModel >> makeBindingLocal: aBinding [	
 
 	self application removeSharedBinding: aBinding.
 	self addBinding: aBinding
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundInteractionModel >> makeBindingShared: aBinding [	
 	
 	self removeBinding: aBinding.
 	self application addSharedBinding: aBinding
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundInteractionModel >> sharedBindings [
 	
 	^ self application sharedBindings 
diff --git a/src/NewTools-Playground/StPlaygroundLoadPageCommand.class.st b/src/NewTools-Playground/StPlaygroundLoadPageCommand.class.st
index 3e2ea20af..14636d859 100644
--- a/src/NewTools-Playground/StPlaygroundLoadPageCommand.class.st
+++ b/src/NewTools-Playground/StPlaygroundLoadPageCommand.class.st
@@ -3,24 +3,26 @@ Load selected page on current playground.
 This command is to be used on `StPlaygroundPagesPresenter`
 "
 Class {
-	#name : #StPlaygroundLoadPageCommand,
-	#superclass : #StPlaygroundCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StPlaygroundLoadPageCommand',
+	#superclass : 'StPlaygroundCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundLoadPageCommand class >> defaultDescription [
 
 	^ 'Load page contents in current playground'
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundLoadPageCommand class >> defaultName [
 
 	^ 'Load'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StPlaygroundLoadPageCommand >> execute [
 
 	self context doLoadPage
diff --git a/src/NewTools-Playground/StPlaygroundLoadPageOnNewPlaygroundCommand.class.st b/src/NewTools-Playground/StPlaygroundLoadPageOnNewPlaygroundCommand.class.st
index d48782c2e..0a90c8701 100644
--- a/src/NewTools-Playground/StPlaygroundLoadPageOnNewPlaygroundCommand.class.st
+++ b/src/NewTools-Playground/StPlaygroundLoadPageOnNewPlaygroundCommand.class.st
@@ -3,24 +3,26 @@ Load selected page in a new playground.
 This command is to be used on `StPlaygroundPagesPresenter`
 "
 Class {
-	#name : #StPlaygroundLoadPageOnNewPlaygroundCommand,
-	#superclass : #StPlaygroundCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StPlaygroundLoadPageOnNewPlaygroundCommand',
+	#superclass : 'StPlaygroundCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundLoadPageOnNewPlaygroundCommand class >> defaultDescription [
 
 	^ 'Load page contents in new playground'
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundLoadPageOnNewPlaygroundCommand class >> defaultName [
 
 	^ 'Load on new playground'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StPlaygroundLoadPageOnNewPlaygroundCommand >> execute [
 
 	self context doLoadPageOnNewPlayground
diff --git a/src/NewTools-Playground/StPlaygroundMenuExtensionCommand.class.st b/src/NewTools-Playground/StPlaygroundMenuExtensionCommand.class.st
index 13e964a9d..192e32e6e 100644
--- a/src/NewTools-Playground/StPlaygroundMenuExtensionCommand.class.st
+++ b/src/NewTools-Playground/StPlaygroundMenuExtensionCommand.class.st
@@ -4,12 +4,14 @@ Extension point to add functionality to the playground.
 Commands inheriting `StPlaygroundMenuExtensionCommand` will be added to the playground context menu.
 "
 Class {
-	#name : #StPlaygroundMenuExtensionCommand,
-	#superclass : #SpToolCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StPlaygroundMenuExtensionCommand',
+	#superclass : 'SpToolCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundMenuExtensionCommand class >> allCommands [
 
 	^ self allSubclasses
diff --git a/src/NewTools-Playground/StPlaygroundPage.class.st b/src/NewTools-Playground/StPlaygroundPage.class.st
index 46865c868..0110984d1 100644
--- a/src/NewTools-Playground/StPlaygroundPage.class.st
+++ b/src/NewTools-Playground/StPlaygroundPage.class.st
@@ -7,8 +7,8 @@ Pages are stored (by default) at ==StPlayground cacheDirectory== and have a time
 @@TODO complete
 "
 Class {
-	#name : #StPlaygroundPage,
-	#superclass : #Object,
+	#name : 'StPlaygroundPage',
+	#superclass : 'Object',
 	#instVars : [
 		'creationTime',
 		'fileName',
@@ -20,28 +20,30 @@ Class {
 		'baseDirectory',
 		'versionLog'
 	],
-	#category : #'NewTools-Playground-Model'
+	#category : 'NewTools-Playground-Model',
+	#package : 'NewTools-Playground',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPage class >> defaultTimeToWait [
 
 	^ 10 seconds
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StPlaygroundPage class >> fromReference: aFileReference [
 
 	^ self new fromReference: aFileReference
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPage class >> pageExtension [
 
 	^ 'ph'
 ]
 
-{ #category : #'inspector compatibility' }
+{ #category : 'inspector compatibility' }
 StPlaygroundPage >> asInspectorModel [
 	"Since the playground can be the starting point of an inspection (using <meta+g>), the 
 	 playground page (which is the model of a playground) needs to behave as a valid starting point. 
@@ -50,25 +52,25 @@ StPlaygroundPage >> asInspectorModel [
 	^ self
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPage >> baseDirectory [
 	
 	^ baseDirectory ifNil:[ StPlaygroundPresenter cacheDirectory ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPage >> baseDirectory: aDirectory [
 	
 	baseDirectory := aDirectory
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPage >> basicContents: aString [ 
 	
 	flushContents := aString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPage >> contents [
 
 	^ self fileReference 
@@ -76,7 +78,7 @@ StPlaygroundPage >> contents [
 		ifAbsent: [ '' ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPage >> contents: aString [
 
 	aString asString trimmed ifEmpty: [ ^ self ].
@@ -86,13 +88,13 @@ StPlaygroundPage >> contents: aString [
 		self spawnFlushProcess ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPage >> creationTime [
 
 	^ creationTime
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPage >> creationTimeForFileName [
 
 	^ (self creationTime asString 
@@ -100,7 +102,7 @@ StPlaygroundPage >> creationTimeForFileName [
 		copyReplaceAll: '.' with: '-'
 ]
 
-{ #category : #'inspector compatibility' }
+{ #category : 'inspector compatibility' }
 StPlaygroundPage >> defaultObjectInspectorClass [
 	"Since the playground can be the starting point of an inspection (using <meta+g>), the 
 	 playground page (which is the model of a playground) needs to behave as a valid starting point. 
@@ -109,26 +111,26 @@ StPlaygroundPage >> defaultObjectInspectorClass [
 	^ StPlaygroundPagePresenter
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPage >> ensureContentsFlushed [
 
 	flushContents isEmptyOrNil ifTrue: [ ^ self ].
 	self flush
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPage >> fileName [
 
 	^ fileName ifNil: [ fileName := self creationTimeForFileName ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPage >> fileReference [
 
 	^ (self baseDirectory / self fileName) withExtension: self class pageExtension
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPage >> flush [
 
 	mutex critical: [ 
@@ -142,7 +144,7 @@ StPlaygroundPage >> flush [
 		self storeVersion ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPage >> fromReference: aFileReference [
 
 	aFileReference parent = self baseDirectory 
@@ -151,7 +153,7 @@ StPlaygroundPage >> fromReference: aFileReference [
 	creationTime := aFileReference creationTime
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPage >> initialize [
 
 	super initialize.
@@ -160,7 +162,7 @@ StPlaygroundPage >> initialize [
 	mutex := Mutex new
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPage >> spawnFlushProcess [
 
 	(flushProcess notNil 
@@ -178,7 +180,7 @@ StPlaygroundPage >> spawnFlushProcess [
 	] fork
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPage >> storeVersion [
 	| entry |
 
@@ -192,26 +194,26 @@ StPlaygroundPage >> storeVersion [
 	self versionLog newEntry: entry
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPage >> timeToWait [
 
 	^ timeToWait ifNil: [ self class defaultTimeToWait ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPage >> timeToWait: aDuration [
 
 	timeToWait := aDuration
 ]
 
-{ #category : #'accessing - versions' }
+{ #category : 'accessing - versions' }
 StPlaygroundPage >> versionLog [
 	
 	^ versionLog ifNil: [ 
 		versionLog := OmFileStore fromFile: (self fileReference withExtension: 'ombu') ]
 ]
 
-{ #category : #'accessing - versions' }
+{ #category : 'accessing - versions' }
 StPlaygroundPage >> versions [
 	
 	^ Array streamContents: [ :stream | 
diff --git a/src/NewTools-Playground/StPlaygroundPagePresenter.class.st b/src/NewTools-Playground/StPlaygroundPagePresenter.class.st
index 12bb87f57..fca50b555 100644
--- a/src/NewTools-Playground/StPlaygroundPagePresenter.class.st
+++ b/src/NewTools-Playground/StPlaygroundPagePresenter.class.st
@@ -3,8 +3,8 @@ The content of a playground page.
 Since `StPlayground` is in fact a miller list that allows users to navigate, the actual ""playground"" resides here.
 "
 Class {
-	#name : #StPlaygroundPagePresenter,
-	#superclass : #StPresenter,
+	#name : 'StPlaygroundPagePresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'text',
 		'toolbar',
@@ -17,10 +17,12 @@ Class {
 	#classVars : [
 		'CacheDirectory'
 	],
-	#category : #'NewTools-Playground-View'
+	#category : 'NewTools-Playground-View',
+	#package : 'NewTools-Playground',
+	#tag : 'View'
 }
 
-{ #category : #'private commands' }
+{ #category : 'private commands' }
 StPlaygroundPagePresenter class >> baseToolbarCommands [
 
 	^ { 
@@ -32,26 +34,26 @@ StPlaygroundPagePresenter class >> baseToolbarCommands [
 	}
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagePresenter class >> cacheDirectory [
 	
 	^ CacheDirectory ifNil: [ self defaultCacheDirectory ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagePresenter class >> cacheDirectory: aDirectory [
 	
 	self flag: #TODO. "This go to settings"
 	CacheDirectory := aDirectory ensureCreateDirectory
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagePresenter class >> defaultCacheDirectory [
 	
 	^ (FileLocator localDirectory / 'play-cache') ensureCreateDirectory
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StPlaygroundPagePresenter class >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
@@ -62,32 +64,32 @@ StPlaygroundPagePresenter class >> defaultLayout [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagePresenter class >> defaultTitle [ 
 
 	^ 'Playground'
 ]
 
-{ #category : #'private commands' }
+{ #category : 'private commands' }
 StPlaygroundPagePresenter class >> extendedMenuCommands [
 
 	^ StPlaygroundMenuExtensionCommand allCommands
 ]
 
-{ #category : #'private commands' }
+{ #category : 'private commands' }
 StPlaygroundPagePresenter class >> extendedToolbarCommands [
 
 	^ StPlaygroundToolbarExtensionCommand allCommands
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StPlaygroundPagePresenter class >> open [ 
 	<script>
 	
 	^ (self on: StPlaygroundPage new) open
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StPlaygroundPagePresenter class >> openContents: aString [
 	"Open a new workspace with the given contents. It looks better when aString is code since the style is applied"
 
@@ -96,7 +98,7 @@ StPlaygroundPagePresenter class >> openContents: aString [
 		open
 ]
 
-{ #category : #'tools registry' }
+{ #category : 'tools registry' }
 StPlaygroundPagePresenter class >> registerToolsOn: registry [
 	"Add ourselves to registry. See [Smalltalk tools]" 
 
@@ -104,69 +106,69 @@ StPlaygroundPagePresenter class >> registerToolsOn: registry [
 
 ]
 
-{ #category : #'private commands' }
+{ #category : 'private commands' }
 StPlaygroundPagePresenter class >> toolbarCommands [
 
 	^ (self baseToolbarCommands, self extendedToolbarCommands) sorted: #order ascending
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StPlaygroundPagePresenter >> activateOnDoubleClick [
 	"For compatibility, playground will not activate on single or double click (but in <meta+g>)"
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StPlaygroundPagePresenter >> activateOnSingleClick [
 	"For compatibility, playground will not activate on single or double click (but in <meta+g>)"
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagePresenter >> addMenuCommandsTo: aGroup [
 
 	self class extendedMenuCommands 
 		do: [ :each | aGroup register: (each forSpecContext: self) ]	
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagePresenter >> addMenuEditionCommandsTo: aCommandGroup presenter: aCodePresenter [
 
 	aCodePresenter backendIncludesEditionMenu ifTrue: [ ^ self ].
 	aCommandGroup register: (aCodePresenter editionCommandsGroup name: 'Edition')
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagePresenter >> addToolbarCommandsTo: aGroup [
 
 	self class toolbarCommands do: [ :each | 
 		aGroup register: (each forSpecContext: self) ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagePresenter >> basicPage: aPage [ 
 
 	page := aPage
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagePresenter >> contents: aString [
 
 	text text: aString
 ]
 
-{ #category : #'api - focus' }
+{ #category : 'api - focus' }
 StPlaygroundPagePresenter >> defaultKeyboardFocus [
 
 	^ text
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StPlaygroundPagePresenter >> doEvaluateAllAndGo [
 
 	self selectAll.
 	self doEvaluateAndGo
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StPlaygroundPagePresenter >> doEvaluateAndGo [
 	| value |
 
@@ -180,19 +182,19 @@ StPlaygroundPagePresenter >> doEvaluateAndGo [
 	activationBlock value: value
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagePresenter >> ensureContentsFlushed [
 
 	self page ensureContentsFlushed
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StPlaygroundPagePresenter >> hasOutputActivationPort [
 	
 	^ true
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagePresenter >> initializePresenters [
 
 	self initializeToolbar.
@@ -219,7 +221,7 @@ StPlaygroundPagePresenter >> initializePresenters [
 		whenFocusReceivedDo: [ self updateLineNumber ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagePresenter >> initializeStatusbar [ 
 
 	(statusbar := self instantiate: SpPresenter)
@@ -239,7 +241,7 @@ StPlaygroundPagePresenter >> initializeStatusbar [
 		whenChangedDo: [ :state | self showLineNumbers: state ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagePresenter >> initializeToolbar [
 
 	toolbar := self newToolbar
@@ -249,7 +251,7 @@ StPlaygroundPagePresenter >> initializeToolbar [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagePresenter >> initializeWindow: aWindowPresenter [
 
 	super initializeWindow: aWindowPresenter.
@@ -259,13 +261,13 @@ StPlaygroundPagePresenter >> initializeWindow: aWindowPresenter [
 		whenOpenedDo: [ text takeKeyboardFocus ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagePresenter >> interactionModel [
 
 	^ text interactionModel
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundPagePresenter >> loadPage: aFileReference [
 
 	self basicPage: (StPlaygroundPage fromReference: aFileReference).
@@ -273,7 +275,7 @@ StPlaygroundPagePresenter >> loadPage: aFileReference [
 	^ page
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagePresenter >> menuActionsFor: aCodePresenter [
 
 	^ CmCommandGroup forSpec
@@ -298,19 +300,19 @@ StPlaygroundPagePresenter >> menuActionsFor: aCodePresenter [
 		yourself
 ]
 
-{ #category : #transmission }
+{ #category : 'transmission' }
 StPlaygroundPagePresenter >> outputActivationPort [
 
 	^ SpActivationPort newPresenter: self
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagePresenter >> page [
 
 	^ page
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagePresenter >> preferredExtent: aSize [
 
 	(self window isMaximized 
@@ -319,13 +321,13 @@ StPlaygroundPagePresenter >> preferredExtent: aSize [
 	self class preferredExtent: aSize
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagePresenter >> selectAll [
 	
 	^ text selectAll
 ]
 
-{ #category : #'inspector compatibility' }
+{ #category : 'inspector compatibility' }
 StPlaygroundPagePresenter >> selectedPageName [
 	"Since the playground can be the starting point of an inspection (using <meta+g>), the 
 	 page presenter (which is the playground itself) needs to respond to which kind of page 
@@ -334,25 +336,25 @@ StPlaygroundPagePresenter >> selectedPageName [
 	^ self class defaultTitle
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagePresenter >> selectedTextOrLine [
 	
 	^ text selectedTextOrLine
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StPlaygroundPagePresenter >> setModelBeforeInitialization: aPage [
 
 	page := aPage
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagePresenter >> showLineNumbers [
 
 	^ StPharoSettings codeShowLineNumbers
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StPlaygroundPagePresenter >> showLineNumbers: aBoolean [
 
 	StPharoSettings codeShowLineNumbers: aBoolean.
@@ -360,19 +362,19 @@ StPlaygroundPagePresenter >> showLineNumbers: aBoolean [
 	toggleLineNumberButton label: (StShowLineNumbersCommand iconLabelFor: self showLineNumbers)
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagePresenter >> text [
 
 	^ text
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundPagePresenter >> toggleShowLineNumbers [
 
 	self showLineNumbers: self showLineNumbers not
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagePresenter >> toolbarActions [
 
 	^ CmCommandGroup forSpec
@@ -380,7 +382,7 @@ StPlaygroundPagePresenter >> toolbarActions [
 		yourself
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 StPlaygroundPagePresenter >> updateLineNumber [
 	| pos |
 	
@@ -391,7 +393,7 @@ StPlaygroundPagePresenter >> updateLineNumber [
 		ifNil: [ '' ])
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagePresenter >> updatePresenter [
 
 	page ifNotNil: [
@@ -399,13 +401,13 @@ StPlaygroundPagePresenter >> updatePresenter [
 	self updateLineNumber
 ]
 
-{ #category : #'api - events' }
+{ #category : 'api - events' }
 StPlaygroundPagePresenter >> whenActivatedDo: aBlock [
 
 	activationBlock := aBlock
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagePresenter >> windowIcon [
 	
 	^ self application iconNamed: #workspace
diff --git a/src/NewTools-Playground/StPlaygroundPageSummaryPresenter.class.st b/src/NewTools-Playground/StPlaygroundPageSummaryPresenter.class.st
index 498d32273..e0a0b6e80 100644
--- a/src/NewTools-Playground/StPlaygroundPageSummaryPresenter.class.st
+++ b/src/NewTools-Playground/StPlaygroundPageSummaryPresenter.class.st
@@ -4,23 +4,25 @@ It will include the first line of the page and the creation date.
 I am meant to be used in StPlaygroundPagesPresenter, as element of a list.
 "
 Class {
-	#name : #StPlaygroundPageSummaryPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StPlaygroundPageSummaryPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'page',
 		'firstLineLabel',
 		'timeLabel'
 	],
-	#category : #'NewTools-Playground-View'
+	#category : 'NewTools-Playground-View',
+	#package : 'NewTools-Playground',
+	#tag : 'View'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPageSummaryPresenter >> contents [
 
 	^ page contents
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPageSummaryPresenter >> initializePresenters [
 
 	layout := SpBoxLayout newTopToBottom
@@ -36,13 +38,13 @@ StPlaygroundPageSummaryPresenter >> initializePresenters [
 		label: page creationTime epiceaBrowsersAsString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPageSummaryPresenter >> page [
 
 	^ page
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPageSummaryPresenter >> pageFirstLine [
 		
 	page readStreamDo: [ :stream | | line |
@@ -52,7 +54,7 @@ StPlaygroundPageSummaryPresenter >> pageFirstLine [
 	^ 'Empty'
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StPlaygroundPageSummaryPresenter >> setModelBeforeInitialization: aPage [
 
 	page := aPage
diff --git a/src/NewTools-Playground/StPlaygroundPageVersionsPresenter.class.st b/src/NewTools-Playground/StPlaygroundPageVersionsPresenter.class.st
index 256668bfe..e8aa77fef 100644
--- a/src/NewTools-Playground/StPlaygroundPageVersionsPresenter.class.st
+++ b/src/NewTools-Playground/StPlaygroundPageVersionsPresenter.class.st
@@ -3,30 +3,32 @@ A presenter to show all stored versions of a page.
 A version is taken each time we will flush a new version of the page to the disk, making changes in the playground recoverable..
 "
 Class {
-	#name : #StPlaygroundPageVersionsPresenter,
-	#superclass : #StPresenter,
+	#name : 'StPlaygroundPageVersionsPresenter',
+	#superclass : 'StPresenter',
 	#traits : 'SpTModel',
 	#classTraits : 'SpTModel classTrait',
 	#instVars : [
 		'versionList',
 		'sourceCode'
 	],
-	#category : #'NewTools-Playground-View'
+	#category : 'NewTools-Playground-View',
+	#package : 'NewTools-Playground',
+	#tag : 'View'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPageVersionsPresenter class >> preferredExtent [
 
 	^ (700@400) scaledByDisplayScaleFactor
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundPageVersionsPresenter >> adoptSelectedVersion [
 
 	self adoptVersion: versionList selectedItem
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundPageVersionsPresenter >> adoptVersion: anEntry [
 
 	self parent contents: anEntry content.
@@ -34,20 +36,20 @@ StPlaygroundPageVersionsPresenter >> adoptVersion: anEntry [
 	self parent takeKeyboardFocus
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPageVersionsPresenter >> displayValueFor: aDateAndTime [
 
 	"^ ((DateAndTime now - aDateAndTime) truncateTo: 2 minutes) humanReadablePrintString"
 	^ aDateAndTime epiceaBrowsersAsString
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundPageVersionsPresenter >> doAdoptVersion [
 
 	self adoptSelectedVersion
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundPageVersionsPresenter >> doAdoptVersionOnNewPlayground [
 	| playground |
 	
@@ -58,7 +60,7 @@ StPlaygroundPageVersionsPresenter >> doAdoptVersionOnNewPlayground [
 	playground takeKeyboardFocus
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPageVersionsPresenter >> initializeDialogWindow: aDialogWindowPresenter [
 
 	aDialogWindowPresenter
@@ -70,7 +72,7 @@ StPlaygroundPageVersionsPresenter >> initializeDialogWindow: aDialogWindowPresen
 			presenter close ]	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPageVersionsPresenter >> initializePresenters [
 
 	self layout: (SpPanedLayout newLeftToRight
@@ -94,7 +96,7 @@ StPlaygroundPageVersionsPresenter >> initializePresenters [
 				ifNil: [ 'no source' ] ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPageVersionsPresenter >> initializeWindow: aWindowPresenter [
 
 	super initializeWindow: aWindowPresenter.
@@ -103,20 +105,20 @@ StPlaygroundPageVersionsPresenter >> initializeWindow: aWindowPresenter [
 		initialExtent: self class preferredExtent
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPageVersionsPresenter >> parent [
 	"a synonym to be clearer"
 
 	^ self model
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPageVersionsPresenter >> updatePresenter [
 
 	versionList items: self model page versions reversed
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPageVersionsPresenter >> versionsActions [
 
 	^ CmCommandGroup forSpec
diff --git a/src/NewTools-Playground/StPlaygroundPagesCommand.class.st b/src/NewTools-Playground/StPlaygroundPagesCommand.class.st
index 7a42523c8..5cd33ba3d 100644
--- a/src/NewTools-Playground/StPlaygroundPagesCommand.class.st
+++ b/src/NewTools-Playground/StPlaygroundPagesCommand.class.st
@@ -2,36 +2,38 @@
 I open the page selector persenter and allow the user to chose a page to load.
 "
 Class {
-	#name : #StPlaygroundPagesCommand,
-	#superclass : #StPlaygroundCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StPlaygroundPagesCommand',
+	#superclass : 'StPlaygroundCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundPagesCommand class >> defaultDescription [
 
 	^ 'Load a saved page'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagesCommand class >> defaultIconName [
 
 	^ #glamorousMore
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundPagesCommand class >> defaultName [
 
 	^ 'Pages'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagesCommand class >> order [
 
 	^ 30
 ]
 
-{ #category : #execution }
+{ #category : 'execution' }
 StPlaygroundPagesCommand >> execute [ 
 
 	(StPlaygroundPagesPresenter 
diff --git a/src/NewTools-Playground/StPlaygroundPagesPresenter.class.st b/src/NewTools-Playground/StPlaygroundPagesPresenter.class.st
index facbaef10..560abebfe 100644
--- a/src/NewTools-Playground/StPlaygroundPagesPresenter.class.st
+++ b/src/NewTools-Playground/StPlaygroundPagesPresenter.class.st
@@ -5,8 +5,8 @@ A playground saves (or tries to save) everything you will put in a playground an
 I show a list and a preview of a page content, to allow users to chose a page to load.
 "
 Class {
-	#name : #StPlaygroundPagesPresenter,
-	#superclass : #StPresenter,
+	#name : 'StPlaygroundPagesPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'parent',
 		'pageList',
@@ -14,16 +14,18 @@ Class {
 		'pageListPanel',
 		'pagePreviewPanel'
 	],
-	#category : #'NewTools-Playground-View'
+	#category : 'NewTools-Playground-View',
+	#package : 'NewTools-Playground',
+	#tag : 'View'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagesPresenter class >> defaultExtent [
 
 	^ (700@400) scaledByDisplayScaleFactor
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StPlaygroundPagesPresenter class >> defaultLayout [
 
 	^ SpPanedLayout newLeftToRight
@@ -33,37 +35,37 @@ StPlaygroundPagesPresenter class >> defaultLayout [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagesPresenter class >> defaultTitle [
 
 	^ 'Pages'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagesPresenter class >> emptyMessage [
 
 	^ 'There are no pages to list.'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagesPresenter class >> pages [
 
 	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagesPresenter class >> unselectedMessage [
 
 	^ 'Select a page to preview it.'
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundPagesPresenter >> doLoadPage [
 	
 	self loadSelectedPage
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundPagesPresenter >> doLoadPageOnNewPlayground [
 	| playground |
 	
@@ -74,7 +76,7 @@ StPlaygroundPagesPresenter >> doLoadPageOnNewPlayground [
 	playground takeKeyboardFocus 		
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagesPresenter >> initializeDialogWindow: aDialogWindowPresenter [
 
 	aDialogWindowPresenter 
@@ -87,7 +89,7 @@ StPlaygroundPagesPresenter >> initializeDialogWindow: aDialogWindowPresenter [
 			presenter close ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagesPresenter >> initializePresenters [
 
 	(pageListPanel := self instantiate: StHeaderPanel)		
@@ -121,7 +123,7 @@ StPlaygroundPagesPresenter >> initializePresenters [
 		ifEmpty: [ pagePreview updatePresenter ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagesPresenter >> initializeWindow: aWindowPresenter [
 
 	super initializeWindow: aWindowPresenter.
@@ -131,7 +133,7 @@ StPlaygroundPagesPresenter >> initializeWindow: aWindowPresenter [
 		whenOpenedDo: [ pageList takeKeyboardFocus ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundPagesPresenter >> loadPage: aPage [
 
 	self parent loadPage: aPage.
@@ -139,20 +141,20 @@ StPlaygroundPagesPresenter >> loadPage: aPage [
 	self parent takeKeyboardFocus 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundPagesPresenter >> loadSelectedPage [
 
 	self loadPage: self selectedPage
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagesPresenter >> pages [
 	
 	^ (StPlaygroundPresenter cacheDirectory allChildrenMatching: '*.ph')
 		sorted: [ :a :b | a creationTime > b creationTime ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagesPresenter >> pagesActions [
 
 	^ CmCommandGroup forSpec
@@ -162,7 +164,7 @@ StPlaygroundPagesPresenter >> pagesActions [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPagesPresenter >> pagesAsPresenters [
 
 	^ self pages collect: [ :each | 
@@ -171,19 +173,19 @@ StPlaygroundPagesPresenter >> pagesAsPresenters [
 			on: each  ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPagesPresenter >> parent [
 
 	^ parent
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPagesPresenter >> selectedPage [
 
 	^ pageList selection selectedItem page
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StPlaygroundPagesPresenter >> setModelBeforeInitialization: aPlayground [
 
 	parent := aPlayground
diff --git a/src/NewTools-Playground/StPlaygroundPresenter.class.st b/src/NewTools-Playground/StPlaygroundPresenter.class.st
index 0e120012e..9ecb836e7 100644
--- a/src/NewTools-Playground/StPlaygroundPresenter.class.st
+++ b/src/NewTools-Playground/StPlaygroundPresenter.class.st
@@ -45,52 +45,54 @@ See *class:StPlaygroundPagesPresenter*
 
 "
 Class {
-	#name : #StPlaygroundPresenter,
-	#superclass : #StInspectorPresenter,
+	#name : 'StPlaygroundPresenter',
+	#superclass : 'StInspectorPresenter',
 	#classVars : [
 		'CacheDirectory'
 	],
-	#category : #'NewTools-Playground-View'
+	#category : 'NewTools-Playground-View',
+	#package : 'NewTools-Playground',
+	#tag : 'View'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPresenter class >> cacheDirectory [
 	
 	^ CacheDirectory ifNil: [ self defaultCacheDirectory ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPresenter class >> cacheDirectory: aDirectory [
 	
 	CacheDirectory := aDirectory ensureCreateDirectory
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StPlaygroundPresenter class >> defaultCacheDirectory [
 	
 	^ (FileLocator localDirectory / 'play-cache') ensureCreateDirectory
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPresenter class >> defaultExtent [
 
 	^ (600@400) scaledByDisplayScaleFactor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPresenter class >> defaultTitle [ 
 
 	^ 'Playground'
 ]
 
-{ #category : #'class initialization' }
+{ #category : 'class initialization' }
 StPlaygroundPresenter class >> initialize [
 
 	"Make playground active by default"
 	self register
 ]
 
-{ #category : #'world menu' }
+{ #category : 'world menu' }
 StPlaygroundPresenter class >> menuCommandOn: aBuilder [
 	<worldMenu>
 	(aBuilder item: #Playground)
@@ -102,14 +104,14 @@ StPlaygroundPresenter class >> menuCommandOn: aBuilder [
 		icon: (self iconNamed: #workspace)
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StPlaygroundPresenter class >> open [
 
 	<script>
 	^ self new open
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StPlaygroundPresenter class >> openContents: aString [
 	"Open a new workspace with the given contents. It looks better when aString is code since the style is applied"
 
@@ -118,7 +120,7 @@ StPlaygroundPresenter class >> openContents: aString [
 		open
 ]
 
-{ #category : #'tools registry' }
+{ #category : 'tools registry' }
 StPlaygroundPresenter class >> register [
 	"Add ourselves to registry. See [Smalltalk tools]" 
 	<script>
@@ -126,7 +128,7 @@ StPlaygroundPresenter class >> register [
 	self registerToolsOn: Smalltalk tools
 ]
 
-{ #category : #'tools registry' }
+{ #category : 'tools registry' }
 StPlaygroundPresenter class >> registerToolsOn: registry [
 	"Add ourselves to registry. See [Smalltalk tools]" 
 
@@ -134,7 +136,7 @@ StPlaygroundPresenter class >> registerToolsOn: registry [
 
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StPlaygroundPresenter class >> settingsOn: aBuilder [
 <systemsettings>
 
@@ -148,31 +150,31 @@ StPlaygroundPresenter class >> settingsOn: aBuilder [
 		label: 'Local Playground cache directory'.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPresenter >> contents: aString [ 
 
 	self firstPage contents: aString
 ]
 
-{ #category : #'api - focus' }
+{ #category : 'api - focus' }
 StPlaygroundPresenter >> defaultKeyboardFocus [
 
 	^ self firstPage
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StPlaygroundPresenter >> loadPage: aFileReference [
 
 	self firstPage loadPage: aFileReference
 ]
 
-{ #category : #'private - factory' }
+{ #category : 'private - factory' }
 StPlaygroundPresenter >> newDefaultPlaygroundPage [
 
 	^ StPlaygroundPage new
 ]
 
-{ #category : #'private - factory' }
+{ #category : 'private - factory' }
 StPlaygroundPresenter >> newInspectorFor: aModel [
 	| modelToInspectOrPlayground |
 	
@@ -183,32 +185,32 @@ StPlaygroundPresenter >> newInspectorFor: aModel [
 	^ super newInspectorFor: modelToInspectOrPlayground
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPresenter >> page [
 
 	^ self firstPage page
 ]
 
-{ #category : #'private - stepping' }
+{ #category : 'private - stepping' }
 StPlaygroundPresenter >> startProcessing [
 	
 	"A playground does not steps, do nothing"
 ]
 
-{ #category : #'private - stepping' }
+{ #category : 'private - stepping' }
 StPlaygroundPresenter >> stopProcessing [
 	
 	"A playground does not steps, but it needs to force a flush of last changes"
 	self firstPage ensureContentsFlushed
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPresenter >> windowIcon [
 	
 	^ self application iconNamed: #workspace
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundPresenter >> windowTitle [
 
 	^ self class defaultTitle
diff --git a/src/NewTools-Playground/StPlaygroundPublishCommand.class.st b/src/NewTools-Playground/StPlaygroundPublishCommand.class.st
index a618f8b2f..2dcfb562c 100644
--- a/src/NewTools-Playground/StPlaygroundPublishCommand.class.st
+++ b/src/NewTools-Playground/StPlaygroundPublishCommand.class.st
@@ -2,42 +2,44 @@
 Publish the content of a page in [http://ws.stfx.eu](http://ws.stfx.eu)
 "
 Class {
-	#name : #StPlaygroundPublishCommand,
-	#superclass : #StPlaygroundCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StPlaygroundPublishCommand',
+	#superclass : 'StPlaygroundCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundPublishCommand class >> defaultDescription [
 
 	^  'Publish contents to the cloud.'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPublishCommand class >> defaultIconName [
 
 	^ #glamorousSaveToUrl
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundPublishCommand class >> defaultName [
 
 	^ 'Publish'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPublishCommand class >> order [
 
 	^ 5
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPublishCommand class >> urlProvider [
 
 	^ 'http://ws.stfx.eu' asZnUrl
 ]
 
-{ #category : #execution }
+{ #category : 'execution' }
 StPlaygroundPublishCommand >> execute [
 
 	| contents publishedUrl |
@@ -56,13 +58,13 @@ StPlaygroundPublishCommand >> execute [
 		publishedUrl , ' was published and the url was copied to clipboard'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundPublishCommand >> page [
 
 	^ context page
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StPlaygroundPublishCommand >> post: aString [
 	| response url |
 
diff --git a/src/NewTools-Playground/StPlaygroundScriptPage.class.st b/src/NewTools-Playground/StPlaygroundScriptPage.class.st
index f1f7b4981..daff89382 100644
--- a/src/NewTools-Playground/StPlaygroundScriptPage.class.st
+++ b/src/NewTools-Playground/StPlaygroundScriptPage.class.st
@@ -9,21 +9,23 @@ reference := 'script.st' asFileReference.
 ```
 "
 Class {
-	#name : #StPlaygroundScriptPage,
-	#superclass : #StPlaygroundPage,
+	#name : 'StPlaygroundScriptPage',
+	#superclass : 'StPlaygroundPage',
 	#instVars : [
 		'fileReference'
 	],
-	#category : #'NewTools-Playground-Model'
+	#category : 'NewTools-Playground-Model',
+	#package : 'NewTools-Playground',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundScriptPage >> fileReference [
 
 	^ fileReference
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StPlaygroundScriptPage >> fromReference: aFileReference [
 
 	super fromReference: aFileReference.
diff --git a/src/NewTools-Playground/StPlaygroundToolbarExtensionCommand.class.st b/src/NewTools-Playground/StPlaygroundToolbarExtensionCommand.class.st
index 42d3a9c0f..35f62bb53 100644
--- a/src/NewTools-Playground/StPlaygroundToolbarExtensionCommand.class.st
+++ b/src/NewTools-Playground/StPlaygroundToolbarExtensionCommand.class.st
@@ -4,18 +4,20 @@ Extension point to add functionality to the playground.
 Commands inheriting `StPlaygroundToolbarExtensionCommand` will be added to the toolbar.
 "
 Class {
-	#name : #StPlaygroundToolbarExtensionCommand,
-	#superclass : #StPlaygroundCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StPlaygroundToolbarExtensionCommand',
+	#superclass : 'StPlaygroundCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundToolbarExtensionCommand class >> allCommands [
 
 	^ self allSubclasses reject: [ :each | each isAbstract ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StPlaygroundToolbarExtensionCommand class >> isAbstract [
 
 	^ super isAbstract or: [ self == StPlaygroundToolbarExtensionCommand ]
diff --git a/src/NewTools-Playground/StPlaygroundVersionsCommand.class.st b/src/NewTools-Playground/StPlaygroundVersionsCommand.class.st
index a27006875..a03f9c08f 100644
--- a/src/NewTools-Playground/StPlaygroundVersionsCommand.class.st
+++ b/src/NewTools-Playground/StPlaygroundVersionsCommand.class.st
@@ -2,36 +2,38 @@
 Open the page versions browsers.
 "
 Class {
-	#name : #StPlaygroundVersionsCommand,
-	#superclass : #StPlaygroundCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StPlaygroundVersionsCommand',
+	#superclass : 'StPlaygroundCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundVersionsCommand class >> defaultDescription [
 
 	^ 'Browse page versions'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundVersionsCommand class >> defaultIconName [
 
 	^ #history
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StPlaygroundVersionsCommand class >> defaultName [
 
 	^ 'Versions'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPlaygroundVersionsCommand class >> order [
 
 	^ 20
 ]
 
-{ #category : #execution }
+{ #category : 'execution' }
 StPlaygroundVersionsCommand >> execute [ 
 
 	(StPlaygroundPageVersionsPresenter 
diff --git a/src/NewTools-Playground/StRemoveAllBindingsCommand.class.st b/src/NewTools-Playground/StRemoveAllBindingsCommand.class.st
index d32b260d1..4052a5ecd 100644
--- a/src/NewTools-Playground/StRemoveAllBindingsCommand.class.st
+++ b/src/NewTools-Playground/StRemoveAllBindingsCommand.class.st
@@ -2,18 +2,20 @@
 Remove all local bindings (notice that shared bindings will remain)
 "
 Class {
-	#name : #StRemoveAllBindingsCommand,
-	#superclass : #CmCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StRemoveAllBindingsCommand',
+	#superclass : 'CmCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRemoveAllBindingsCommand >> application [
 
 	^ context application
 ]
 
-{ #category : #converting }
+{ #category : 'converting' }
 StRemoveAllBindingsCommand >> asSpecCommand [ 
 	
 	^ super asSpecCommand 
@@ -22,13 +24,13 @@ StRemoveAllBindingsCommand >> asSpecCommand [
 		yourself
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StRemoveAllBindingsCommand >> execute [
 	
 	context removeAllBindings
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRemoveAllBindingsCommand >> initialize [
 	super initialize.
 	self
diff --git a/src/NewTools-Playground/StRemoveBindingCommand.class.st b/src/NewTools-Playground/StRemoveBindingCommand.class.st
index a1772f9d0..0f03c8503 100644
--- a/src/NewTools-Playground/StRemoveBindingCommand.class.st
+++ b/src/NewTools-Playground/StRemoveBindingCommand.class.st
@@ -2,18 +2,20 @@
 Remove a binding.
 "
 Class {
-	#name : #StRemoveBindingCommand,
-	#superclass : #CmCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StRemoveBindingCommand',
+	#superclass : 'CmCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRemoveBindingCommand >> application [
 
 	^ StPharoApplication current
 ]
 
-{ #category : #converting }
+{ #category : 'converting' }
 StRemoveBindingCommand >> asSpecCommand [ 
 	
 	^ super asSpecCommand 
@@ -23,13 +25,13 @@ StRemoveBindingCommand >> asSpecCommand [
 		yourself
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StRemoveBindingCommand >> execute [
 	
 	context removeSelectedBinding
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRemoveBindingCommand >> initialize [
 	super initialize.
 	self
diff --git a/src/NewTools-Playground/StShowLineNumbersCommand.class.st b/src/NewTools-Playground/StShowLineNumbersCommand.class.st
index 807f614ce..2ba71c6a3 100644
--- a/src/NewTools-Playground/StShowLineNumbersCommand.class.st
+++ b/src/NewTools-Playground/StShowLineNumbersCommand.class.st
@@ -7,30 +7,32 @@ Toggles the show line number state (to hide or show line numbers column).
 ]]]
 "
 Class {
-	#name : #StShowLineNumbersCommand,
-	#superclass : #StCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StShowLineNumbersCommand',
+	#superclass : 'StCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StShowLineNumbersCommand class >> defaultDescription [
 
 	^ 'Show/hide line numbers'
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StShowLineNumbersCommand class >> defaultName [
 
 	^ 'Show line numbers'
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StShowLineNumbersCommand class >> hideLineNumbersLabel [
 
 	^ 'Hide line numbers'
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StShowLineNumbersCommand class >> iconLabelFor: aBoolean [
 	
 	^ aBoolean 
@@ -38,19 +40,19 @@ StShowLineNumbersCommand class >> iconLabelFor: aBoolean [
 		ifFalse: [ 'L' ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StShowLineNumbersCommand class >> showLineNumbersLabel [
 
 	^ 'Show line numbers'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StShowLineNumbersCommand >> execute [
 
 	context toggleShowLineNumbers
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StShowLineNumbersCommand >> name [
 
 	^ context showLineNumbers
diff --git a/src/NewTools-Playground/StToggleBindingCommand.class.st b/src/NewTools-Playground/StToggleBindingCommand.class.st
index 0c602f271..1a2250fd2 100644
--- a/src/NewTools-Playground/StToggleBindingCommand.class.st
+++ b/src/NewTools-Playground/StToggleBindingCommand.class.st
@@ -2,42 +2,44 @@
 Toggle the scope of a variable (shared or local)
 "
 Class {
-	#name : #StToggleBindingCommand,
-	#superclass : #StCommand,
-	#category : #'NewTools-Playground-Command'
+	#name : 'StToggleBindingCommand',
+	#superclass : 'StCommand',
+	#category : 'NewTools-Playground-Command',
+	#package : 'NewTools-Playground',
+	#tag : 'Command'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StToggleBindingCommand class >> defaultDescription [
 
 	^ 'Switch binding scope from local to shared and viceversa.'
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StToggleBindingCommand class >> defaultName [
 
 	^ 'Move to shared/local scope'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StToggleBindingCommand class >> moveToLocalName [
 
 	^ 'Make binding local'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StToggleBindingCommand class >> moveToSharedName [
 
 	^ 'Make binding shared'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StToggleBindingCommand >> execute [
 	
 	context toggleSelectedBindingScope
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StToggleBindingCommand >> name [
 
 	context ifNil: [ ^ super name ].
diff --git a/src/NewTools-Playground/package.st b/src/NewTools-Playground/package.st
index 3cd5fd40d..6ace53723 100644
--- a/src/NewTools-Playground/package.st
+++ b/src/NewTools-Playground/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Playground' }
+Package { #name : 'NewTools-Playground' }
diff --git a/src/NewTools-ProjectLoader-Microdown/StProjectLoaderMicrodownRenderer.class.st b/src/NewTools-ProjectLoader-Microdown/StProjectLoaderMicrodownRenderer.class.st
index 73d5feeed..38f2e0289 100644
--- a/src/NewTools-ProjectLoader-Microdown/StProjectLoaderMicrodownRenderer.class.st
+++ b/src/NewTools-ProjectLoader-Microdown/StProjectLoaderMicrodownRenderer.class.st
@@ -3,18 +3,19 @@ I am a simple Microdown renderer.
 I use Microdown to generate a `Text`
 "
 Class {
-	#name : #StProjectLoaderMicrodownRenderer,
-	#superclass : #StProjectLoaderRenderer,
-	#category : #'NewTools-ProjectLoader-Microdown'
+	#name : 'StProjectLoaderMicrodownRenderer',
+	#superclass : 'StProjectLoaderRenderer',
+	#category : 'NewTools-ProjectLoader-Microdown',
+	#package : 'NewTools-ProjectLoader-Microdown'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StProjectLoaderMicrodownRenderer class >> priority [ 
 
 	^ 2
 ]
 
-{ #category : #'ui - operations' }
+{ #category : 'ui - operations' }
 StProjectLoaderMicrodownRenderer >> render: description [
 
 	^ [ PRRichTextComposer microdownAsRichText: description ] 
diff --git a/src/NewTools-ProjectLoader-Microdown/package.st b/src/NewTools-ProjectLoader-Microdown/package.st
index 8478cabe5..1ed673735 100644
--- a/src/NewTools-ProjectLoader-Microdown/package.st
+++ b/src/NewTools-ProjectLoader-Microdown/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-ProjectLoader-Microdown' }
+Package { #name : 'NewTools-ProjectLoader-Microdown' }
diff --git a/src/NewTools-ProjectLoader/LoadableProject.class.st b/src/NewTools-ProjectLoader/LoadableProject.class.st
index 810636e99..21c36a5e9 100644
--- a/src/NewTools-ProjectLoader/LoadableProject.class.st
+++ b/src/NewTools-ProjectLoader/LoadableProject.class.st
@@ -5,8 +5,8 @@ These projects are selected by the Pharo contributors and the selected versions
 This projects holds the metadata to show to the users, to recover the readme from the GitHub project and to load it using metacello.
 "
 Class {
-	#name : #LoadableProject,
-	#superclass : #Object,
+	#name : 'LoadableProject',
+	#superclass : 'Object',
 	#instVars : [
 		'name',
 		'repository',
@@ -16,10 +16,11 @@ Class {
 		'description',
 		'summary'
 	],
-	#category : #'NewTools-ProjectLoader'
+	#category : 'NewTools-ProjectLoader',
+	#package : 'NewTools-ProjectLoader'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 LoadableProject class >> allProjects [ 
 	
 	^ { 	self new
@@ -39,31 +40,31 @@ LoadableProject class >> allProjects [
 				yourself}
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 LoadableProject class >> named: aString [
 
 	^ self new name: aString; yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> baselineName [
 	
 	^ baselineName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> baselineName: aString [
  
 	baselineName := aString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> description [
 
 	^ description ifNil: [ description := self fetchDescription ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 LoadableProject >> fetchDescription [
 
 	| request |
@@ -74,17 +75,17 @@ LoadableProject >> fetchDescription [
 		ifFalse: [ request contents ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> group [
 	^ group
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> group: anObject [
 	group := anObject
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 LoadableProject >> load [
 
 	Metacello new
@@ -93,55 +94,55 @@ LoadableProject >> load [
 		load: self group.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> name [
 	^ name
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> name: anObject [
 	name := anObject
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 LoadableProject >> readMeUrl [
 
 	^ ('https://raw.githubusercontent.com/{1}/{2}/README.md' format: { repository. version }) asUrl
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> repository [
 	^ repository
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> repository: aRepository [
 
 	repository := aRepository 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> repositoryWithVersion [
 	
 	^ 'github://' , self repository , ':' , self version 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> summary [
 	^ summary
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> summary: anObject [
 	summary := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> version [
 	^ version
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 LoadableProject >> version: anObject [
 	version := anObject
 ]
diff --git a/src/NewTools-ProjectLoader/StProjectLoader.class.st b/src/NewTools-ProjectLoader/StProjectLoader.class.st
index 4d4b24a06..0cc05bcbe 100644
--- a/src/NewTools-ProjectLoader/StProjectLoader.class.st
+++ b/src/NewTools-ProjectLoader/StProjectLoader.class.st
@@ -9,8 +9,8 @@ StProjectLoader new openWithSpec
 
 "
 Class {
-	#name : #StProjectLoader,
-	#superclass : #StPresenter,
+	#name : 'StProjectLoader',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'loadableProjects',
 		'menuBarPresenter',
@@ -19,10 +19,11 @@ Class {
 		'tickedProjects',
 		'summaryPanel'
 	],
-	#category : #'NewTools-ProjectLoader'
+	#category : 'NewTools-ProjectLoader',
+	#package : 'NewTools-ProjectLoader'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StProjectLoader class >> defaultSpec [ 
 
 	^ SpBoxLayout newVertical 
@@ -43,13 +44,13 @@ StProjectLoader class >> defaultSpec [
 			yourself
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StProjectLoader class >> toolbarHeight [
 
 	^ 30
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StProjectLoader class >> worldMenuEntry: aBuilder [
 
 	<worldMenu>
@@ -63,14 +64,14 @@ StProjectLoader class >> worldMenuEntry: aBuilder [
 		action: [ self new openWithSpec ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StProjectLoader >> connectPresenters [  
 
 	projectListPresenter 
 		whenSelectionChangedDo: [ self updateSelection ]
 ]
 
-{ #category : #'ui - operations' }
+{ #category : 'ui - operations' }
 StProjectLoader >> displayDescription [
 
 	| description |
@@ -86,7 +87,7 @@ StProjectLoader >> displayDescription [
 		
 ]
 
-{ #category : #'ui - operations' }
+{ #category : 'ui - operations' }
 StProjectLoader >> displaySummary [
 	
 	| summary |
@@ -99,7 +100,7 @@ StProjectLoader >> displaySummary [
 	summaryPanel text: summary.
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StProjectLoader >> initialize [
 	tickedProjects := OrderedCollection new.
 	loadableProjects := LoadableProject allProjects.
@@ -107,7 +108,7 @@ StProjectLoader >> initialize [
 	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StProjectLoader >> initializePresenters [ 
 
 	projectListPresenter := self newTable.
@@ -136,7 +137,7 @@ StProjectLoader >> initializePresenters [
 	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StProjectLoader >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter 
@@ -145,44 +146,44 @@ StProjectLoader >> initializeWindow: aWindowPresenter [
 	
 ]
 
-{ #category : #operations }
+{ #category : 'operations' }
 StProjectLoader >> loadTickedProjects [
 
 	self tickedProjects 
 		do: [ :aProject | aProject load ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StProjectLoader >> loadableProjects [
 
 	^ loadableProjects
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StProjectLoader >> loadableProjects: aColl [
 
 	loadableProjects := aColl
 ]
 
-{ #category : #'ui - operations' }
+{ #category : 'ui - operations' }
 StProjectLoader >> parseDescription: description [
 
 	^ StProjectLoaderRenderer newCurrent render: description
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StProjectLoader >> selectedProjects [
 	
 	^ projectListPresenter selection selectedItems
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StProjectLoader >> tickedProjects [
 
 	^ tickedProjects
 ]
 
-{ #category : #'ui - operations' }
+{ #category : 'ui - operations' }
 StProjectLoader >> updateSelection [
 
 	self displayDescription.
diff --git a/src/NewTools-ProjectLoader/StProjectLoaderNullRenderer.class.st b/src/NewTools-ProjectLoader/StProjectLoaderNullRenderer.class.st
index 911c4141e..9eeda0ae9 100644
--- a/src/NewTools-ProjectLoader/StProjectLoaderNullRenderer.class.st
+++ b/src/NewTools-ProjectLoader/StProjectLoaderNullRenderer.class.st
@@ -3,18 +3,19 @@ I am a simple null renderer.
 I just return the same the string that I receive as argument.
 "
 Class {
-	#name : #StProjectLoaderNullRenderer,
-	#superclass : #StProjectLoaderRenderer,
-	#category : #'NewTools-ProjectLoader'
+	#name : 'StProjectLoaderNullRenderer',
+	#superclass : 'StProjectLoaderRenderer',
+	#category : 'NewTools-ProjectLoader',
+	#package : 'NewTools-ProjectLoader'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StProjectLoaderNullRenderer class >> priority [
 
 	^ 1
 ]
 
-{ #category : #parsing }
+{ #category : 'parsing' }
 StProjectLoaderNullRenderer >> render: anString [
 
 	^ anString
diff --git a/src/NewTools-ProjectLoader/StProjectLoaderRenderer.class.st b/src/NewTools-ProjectLoader/StProjectLoaderRenderer.class.st
index 625d4f072..f0230bd25 100644
--- a/src/NewTools-ProjectLoader/StProjectLoaderRenderer.class.st
+++ b/src/NewTools-ProjectLoader/StProjectLoaderRenderer.class.st
@@ -3,30 +3,31 @@ I am a simple strategy to have different rendering tools to show the text.
 I exist because we don't want to have a dependency with different renderers, for example Microdown.
 "
 Class {
-	#name : #StProjectLoaderRenderer,
-	#superclass : #Object,
-	#category : #'NewTools-ProjectLoader'
+	#name : 'StProjectLoaderRenderer',
+	#superclass : 'Object',
+	#category : 'NewTools-ProjectLoader',
+	#package : 'NewTools-ProjectLoader'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StProjectLoaderRenderer class >> isAbstract [ 
 	
 	^ self name = #StProjectLoaderRenderer
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StProjectLoaderRenderer class >> newCurrent [
 
 	^ (self subclasses sort: [ :a :b | a priority > b priority ]) first new
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StProjectLoaderRenderer class >> priority [
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #parsing }
+{ #category : 'parsing' }
 StProjectLoaderRenderer >> render: aString [
 
 	^ self subclassResponsibility 
diff --git a/src/NewTools-ProjectLoader/package.st b/src/NewTools-ProjectLoader/package.st
index 4afea4a6d..ec6315e8f 100644
--- a/src/NewTools-ProjectLoader/package.st
+++ b/src/NewTools-ProjectLoader/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-ProjectLoader' }
+Package { #name : 'NewTools-ProjectLoader' }
diff --git a/src/NewTools-RewriterTools-Backend-Tests/RTPatternMatcherTest.class.st b/src/NewTools-RewriterTools-Backend-Tests/RTPatternMatcherTest.class.st
index e3e8142b9..6705e0ab6 100644
--- a/src/NewTools-RewriterTools-Backend-Tests/RTPatternMatcherTest.class.st
+++ b/src/NewTools-RewriterTools-Backend-Tests/RTPatternMatcherTest.class.st
@@ -1,20 +1,21 @@
 Class {
-	#name : #RTPatternMatcherTest,
-	#superclass : #TestCase,
+	#name : 'RTPatternMatcherTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'patternMatcher'
 	],
-	#category : #'NewTools-RewriterTools-Backend-Tests'
+	#category : 'NewTools-RewriterTools-Backend-Tests',
+	#package : 'NewTools-RewriterTools-Backend-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 RTPatternMatcherTest >> setUp [
 	super setUp.
 
 	patternMatcher := StRewriterPatternMatcher
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 RTPatternMatcherTest >> testParseCodeASTIsForMethod [
 
 	| code methodCode codeAST |
@@ -37,7 +38,7 @@ aNumber := 5.'.
 		equals: methodCode
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 RTPatternMatcherTest >> testParsePatternASTIsForMethod [
 
 	| rule methodRule ast |
@@ -60,7 +61,7 @@ RTPatternMatcherTest >> testParsePatternASTIsForMethod [
 		equals: methodRule
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 RTPatternMatcherTest >> testPerformMatchingPatternIsForMethod [
 
 	| pharoCode patternCode matches |
diff --git a/src/NewTools-RewriterTools-Backend-Tests/package.st b/src/NewTools-RewriterTools-Backend-Tests/package.st
index 59f81cd18..8f1d9e3c2 100644
--- a/src/NewTools-RewriterTools-Backend-Tests/package.st
+++ b/src/NewTools-RewriterTools-Backend-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-RewriterTools-Backend-Tests' }
+Package { #name : 'NewTools-RewriterTools-Backend-Tests' }
diff --git a/src/NewTools-RewriterTools-Backend/StRewriterAbstractApplier.class.st b/src/NewTools-RewriterTools-Backend/StRewriterAbstractApplier.class.st
index fb33bd7a8..a52a63c8e 100644
--- a/src/NewTools-RewriterTools-Backend/StRewriterAbstractApplier.class.st
+++ b/src/NewTools-RewriterTools-Backend/StRewriterAbstractApplier.class.st
@@ -2,12 +2,14 @@
 I am the abstract class for applying a code transformation
 "
 Class {
-	#name : #StRewriterAbstractApplier,
-	#superclass : #Object,
-	#category : #'NewTools-RewriterTools-Backend-Core'
+	#name : 'StRewriterAbstractApplier',
+	#superclass : 'Object',
+	#category : 'NewTools-RewriterTools-Backend-Core',
+	#package : 'NewTools-RewriterTools-Backend',
+	#tag : 'Core'
 }
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterAbstractApplier class >> applyTransformationChanges: changes [
 
 	| refactoringJob |
@@ -18,19 +20,19 @@ StRewriterAbstractApplier class >> applyTransformationChanges: changes [
 		run
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterAbstractApplier class >> calculateAllChangesForRules: ruleHolderCollection [
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterAbstractApplier class >> calculateChangesForClasses: classes transformationRules: ruleHolderCollection [
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterAbstractApplier class >> defaultEngineApplier [
 
 	^ StRewriterRBApplier
diff --git a/src/NewTools-RewriterTools-Backend/StRewriterDemoRules.class.st b/src/NewTools-RewriterTools-Backend/StRewriterDemoRules.class.st
index f3a2149a6..1951628d0 100644
--- a/src/NewTools-RewriterTools-Backend/StRewriterDemoRules.class.st
+++ b/src/NewTools-RewriterTools-Backend/StRewriterDemoRules.class.st
@@ -2,12 +2,14 @@
 I am a class that creates some demo rules to be used as rule examples
 "
 Class {
-	#name : #StRewriterDemoRules,
-	#superclass : #Object,
-	#category : #'NewTools-RewriterTools-Backend-DefaultRule'
+	#name : 'StRewriterDemoRules',
+	#superclass : 'Object',
+	#category : 'NewTools-RewriterTools-Backend-DefaultRule',
+	#package : 'NewTools-RewriterTools-Backend',
+	#tag : 'DefaultRule'
 }
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterDemoRules class >> defaultRule [
 
 	| lhs rhs inputCode |
@@ -17,7 +19,7 @@ StRewriterDemoRules class >> defaultRule [
 	^ StRewriterRuleHolder lhs: lhs rhs: rhs pharoCode: inputCode
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterDemoRules class >> demoRules [
 
 	^ {
@@ -34,7 +36,7 @@ StRewriterDemoRules class >> demoRules [
 		  self replaceCollectFlattenToFlatCollectRule }
 ]
 
-{ #category : #rules }
+{ #category : 'rules' }
 StRewriterDemoRules class >> removeAssignmentWithoutEffectRule [
 
 	| lhs rhs ruleName |
@@ -44,7 +46,7 @@ StRewriterDemoRules class >> removeAssignmentWithoutEffectRule [
 	^ StRewriterRuleHolder lhs: lhs rhs: rhs name: ruleName
 ]
 
-{ #category : #rules }
+{ #category : 'rules' }
 StRewriterDemoRules class >> removeEqualsInAssertRule [
 
 	| lhs rhs ruleName |
@@ -54,7 +56,7 @@ StRewriterDemoRules class >> removeEqualsInAssertRule [
 	^ StRewriterRuleHolder lhs: lhs rhs: rhs name: ruleName
 ]
 
-{ #category : #rules }
+{ #category : 'rules' }
 StRewriterDemoRules class >> removeIfNilRule [
 
 	| lhs rhs ruleName |
@@ -64,7 +66,7 @@ StRewriterDemoRules class >> removeIfNilRule [
 	^ StRewriterRuleHolder lhs: lhs rhs: rhs name: ruleName
 ]
 
-{ #category : #rules }
+{ #category : 'rules' }
 StRewriterDemoRules class >> replaceAssertToAssertEmptyRule [
 
 	| lhs rhs ruleName |
@@ -74,7 +76,7 @@ StRewriterDemoRules class >> replaceAssertToAssertEmptyRule [
 	^ StRewriterRuleHolder lhs: lhs rhs: rhs name: ruleName
 ]
 
-{ #category : #rules }
+{ #category : 'rules' }
 StRewriterDemoRules class >> replaceCharacterTabAsStringToStringTabRule [
 
 	| lhs rhs ruleName |
@@ -84,7 +86,7 @@ StRewriterDemoRules class >> replaceCharacterTabAsStringToStringTabRule [
 	^ StRewriterRuleHolder lhs: lhs rhs: rhs name: ruleName
 ]
 
-{ #category : #rules }
+{ #category : 'rules' }
 StRewriterDemoRules class >> replaceCollectFlattenToFlatCollectRule [
 
 	| lhs rhs ruleName |
@@ -94,7 +96,7 @@ StRewriterDemoRules class >> replaceCollectFlattenToFlatCollectRule [
 	^ StRewriterRuleHolder lhs: lhs rhs: rhs name: ruleName
 ]
 
-{ #category : #rules }
+{ #category : 'rules' }
 StRewriterDemoRules class >> replaceDenyDenyEmptyRule [
 
 	| lhs rhs ruleName |
@@ -107,7 +109,7 @@ StRewriterDemoRules class >> replaceDenyDenyEmptyRule [
 	^ StRewriterRuleHolder lhs: lhs rhs: rhs name: ruleName
 ]
 
-{ #category : #rules }
+{ #category : 'rules' }
 StRewriterDemoRules class >> replaceSelectToRejectRule [
 
 	| lhs rhs ruleName |
@@ -123,7 +125,7 @@ StRewriterDemoRules class >> replaceSelectToRejectRule [
 	^ StRewriterRuleHolder lhs: lhs rhs: rhs name: ruleName
 ]
 
-{ #category : #rules }
+{ #category : 'rules' }
 StRewriterDemoRules class >> simpliflyConditionalToIsEmptyRule [
 
 	| lhs rhs ruleName |
@@ -133,7 +135,7 @@ StRewriterDemoRules class >> simpliflyConditionalToIsEmptyRule [
 	^ StRewriterRuleHolder lhs: lhs rhs: rhs name: ruleName
 ]
 
-{ #category : #rules }
+{ #category : 'rules' }
 StRewriterDemoRules class >> simpliflyToIfEmptyIfNotEmptyRule [
 
 	| lhs rhs ruleName |
@@ -143,7 +145,7 @@ StRewriterDemoRules class >> simpliflyToIfEmptyIfNotEmptyRule [
 	^ StRewriterRuleHolder lhs: lhs rhs: rhs name: ruleName
 ]
 
-{ #category : #rules }
+{ #category : 'rules' }
 StRewriterDemoRules class >> simplifyToIfNilIfNotNilRule [
 
 	| lhs rhs ruleName |
diff --git a/src/NewTools-RewriterTools-Backend/StRewriterEnvironmentCreator.class.st b/src/NewTools-RewriterTools-Backend/StRewriterEnvironmentCreator.class.st
index 8b36ba62d..74e6fb634 100644
--- a/src/NewTools-RewriterTools-Backend/StRewriterEnvironmentCreator.class.st
+++ b/src/NewTools-RewriterTools-Backend/StRewriterEnvironmentCreator.class.st
@@ -2,18 +2,20 @@
 I am a class that creates an environment in which a set of rewrite rules can be applied.
 "
 Class {
-	#name : #StRewriterEnvironmentCreator,
-	#superclass : #Object,
-	#category : #'NewTools-RewriterTools-Backend-Core'
+	#name : 'StRewriterEnvironmentCreator',
+	#superclass : 'Object',
+	#category : 'NewTools-RewriterTools-Backend-Core',
+	#package : 'NewTools-RewriterTools-Backend',
+	#tag : 'Core'
 }
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterEnvironmentCreator class >> scopeEnvironmentForAllPackages [
 
 	^ RBPackageEnvironment packages: RPackageOrganizer default packages
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterEnvironmentCreator class >> scopeEnvironmentForClasses: classes [
 
 	^ RBClassEnvironment classes: classes
diff --git a/src/NewTools-RewriterTools-Backend/StRewriterPatternMatcher.class.st b/src/NewTools-RewriterTools-Backend/StRewriterPatternMatcher.class.st
index de08b4663..ffc916a1c 100644
--- a/src/NewTools-RewriterTools-Backend/StRewriterPatternMatcher.class.st
+++ b/src/NewTools-RewriterTools-Backend/StRewriterPatternMatcher.class.st
@@ -2,12 +2,14 @@
 I am a class that is used to perform matches between pharo code and rewrite rules code.
 "
 Class {
-	#name : #StRewriterPatternMatcher,
-	#superclass : #Object,
-	#category : #'NewTools-RewriterTools-Backend-Core'
+	#name : 'StRewriterPatternMatcher',
+	#superclass : 'Object',
+	#category : 'NewTools-RewriterTools-Backend-Core',
+	#package : 'NewTools-RewriterTools-Backend',
+	#tag : 'Core'
 }
 
-{ #category : #parsing }
+{ #category : 'parsing' }
 StRewriterPatternMatcher class >> parseCodeAST: code isForMethod: isForMethod [
 
 	^ isForMethod
@@ -15,7 +17,7 @@ StRewriterPatternMatcher class >> parseCodeAST: code isForMethod: isForMethod [
 		ifFalse: [ RBParser parseExpression: code ]
 ]
 
-{ #category : #parsing }
+{ #category : 'parsing' }
 StRewriterPatternMatcher class >> parsePatternAST: lhs isForMethod: isForMethod [
 
 	^ isForMethod
@@ -23,7 +25,7 @@ StRewriterPatternMatcher class >> parsePatternAST: lhs isForMethod: isForMethod
 		ifFalse: [ RBPatternParser parseExpression: lhs ]
 ]
 
-{ #category : #parsing }
+{ #category : 'parsing' }
 StRewriterPatternMatcher class >> performMatching: pharoCode pattern: lhs isForMethod: isForMethod [
 
 	| matches astCode astPattern |
diff --git a/src/NewTools-RewriterTools-Backend/StRewriterRBApplier.class.st b/src/NewTools-RewriterTools-Backend/StRewriterRBApplier.class.st
index c8615a506..e7abf00dd 100644
--- a/src/NewTools-RewriterTools-Backend/StRewriterRBApplier.class.st
+++ b/src/NewTools-RewriterTools-Backend/StRewriterRBApplier.class.st
@@ -2,12 +2,14 @@
 I use the RB rules to apply transformation rules to a set of methods
 "
 Class {
-	#name : #StRewriterRBApplier,
-	#superclass : #StRewriterAbstractApplier,
-	#category : #'NewTools-RewriterTools-Backend-Core'
+	#name : 'StRewriterRBApplier',
+	#superclass : 'StRewriterAbstractApplier',
+	#category : 'NewTools-RewriterTools-Backend-Core',
+	#package : 'NewTools-RewriterTools-Backend',
+	#tag : 'Core'
 }
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterRBApplier class >> calculateAllChangesForRules: ruleHolderCollection [
 
 	| env rewriter |
@@ -17,7 +19,7 @@ StRewriterRBApplier class >> calculateAllChangesForRules: ruleHolderCollection [
 	^ self obtainChanges: env rewriter: rewriter
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterRBApplier class >> calculateChangesForClasses: classes transformationRules: ruleHolderCollection [
 
 	| env rewriter |
@@ -27,7 +29,7 @@ StRewriterRBApplier class >> calculateChangesForClasses: classes transformationR
 	^ self obtainChanges: env rewriter: rewriter
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StRewriterRBApplier class >> obtainChanges: env rewriter: rewriter [
 
 	| checker transformationRule |
@@ -42,7 +44,7 @@ StRewriterRBApplier class >> obtainChanges: env rewriter: rewriter [
 	^ transformationRule changes
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StRewriterRBApplier class >> rewriter: ruleHolderCollection [
 
 	| rewriter |
diff --git a/src/NewTools-RewriterTools-Backend/StRewriterRenrakuApplier.class.st b/src/NewTools-RewriterTools-Backend/StRewriterRenrakuApplier.class.st
index 016c394cc..eb254dedb 100644
--- a/src/NewTools-RewriterTools-Backend/StRewriterRenrakuApplier.class.st
+++ b/src/NewTools-RewriterTools-Backend/StRewriterRenrakuApplier.class.st
@@ -4,12 +4,14 @@ I am a class that is in charge to apply a rule, that is represented in an object
 I use the Renraku engine for applying the transformation rules.
 "
 Class {
-	#name : #StRewriterRenrakuApplier,
-	#superclass : #StRewriterAbstractApplier,
-	#category : #'NewTools-RewriterTools-Backend-Core'
+	#name : 'StRewriterRenrakuApplier',
+	#superclass : 'StRewriterAbstractApplier',
+	#category : 'NewTools-RewriterTools-Backend-Core',
+	#package : 'NewTools-RewriterTools-Backend',
+	#tag : 'Core'
 }
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterRenrakuApplier class >> calculateAllChangesForRules: aRulesCollection [
 
 	| allSystemMethods |
@@ -19,7 +21,7 @@ StRewriterRenrakuApplier class >> calculateAllChangesForRules: aRulesCollection
 	^ self calculateChangesForClasses: allSystemMethods asSet transformationRules: aRulesCollection
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterRenrakuApplier class >> calculateChangesForClasses: methods transformationRules: rules [
 
 	| critiques changes |
@@ -30,7 +32,7 @@ StRewriterRenrakuApplier class >> calculateChangesForClasses: methods transforma
 	^ changes
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StRewriterRenrakuApplier class >> obtainCritiquesOf: methods forRules: ruleHolderCollection [
 
 	"This is a way to obtain the same changes array as obtainChanges:forRule: method. But, here this is done without an RBClassEnvironment and ReSmalllintChecker. Because those two classes inherits from RB rules and will be eventually will be deprecated."
@@ -62,7 +64,7 @@ Take a look on ReCriticEngine for some automation ideas. Also take a look at Com
 	^ critiques
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StRewriterRenrakuApplier class >> obtainCritiquesOfAllMethodsForRules: ruleHolderCollection [
 
 	| methods |
diff --git a/src/NewTools-RewriterTools-Backend/StRewriterRuleHolder.class.st b/src/NewTools-RewriterTools-Backend/StRewriterRuleHolder.class.st
index d0f2b2cdd..7cca0f1ed 100644
--- a/src/NewTools-RewriterTools-Backend/StRewriterRuleHolder.class.st
+++ b/src/NewTools-RewriterTools-Backend/StRewriterRuleHolder.class.st
@@ -2,8 +2,8 @@
 I am a class that is used only to store the information of a rule
 "
 Class {
-	#name : #StRewriterRuleHolder,
-	#superclass : #Object,
+	#name : 'StRewriterRuleHolder',
+	#superclass : 'Object',
 	#instVars : [
 		'lhs',
 		'rhs',
@@ -11,10 +11,12 @@ Class {
 		'name',
 		'pharoCode'
 	],
-	#category : #'NewTools-RewriterTools-Backend-DataStructure'
+	#category : 'NewTools-RewriterTools-Backend-DataStructure',
+	#package : 'NewTools-RewriterTools-Backend',
+	#tag : 'DataStructure'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StRewriterRuleHolder class >> lhs: lhs rhs: rhs [
 
 	^ self new
@@ -23,7 +25,7 @@ StRewriterRuleHolder class >> lhs: lhs rhs: rhs [
 		yourself
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StRewriterRuleHolder class >> lhs: lhs rhs: rhs isForMethod: isForMethod [
 
 	^ self new
@@ -33,7 +35,7 @@ StRewriterRuleHolder class >> lhs: lhs rhs: rhs isForMethod: isForMethod [
 		yourself
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StRewriterRuleHolder class >> lhs: lhs rhs: rhs isForMethod: isForMethod pharoCode: inputCode [
 
 	^ self new
@@ -44,7 +46,7 @@ StRewriterRuleHolder class >> lhs: lhs rhs: rhs isForMethod: isForMethod pharoCo
 		yourself
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StRewriterRuleHolder class >> lhs: lhs rhs: rhs name: aName [
 
 	^ self new
@@ -54,7 +56,7 @@ StRewriterRuleHolder class >> lhs: lhs rhs: rhs name: aName [
 		yourself
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StRewriterRuleHolder class >> lhs: lhs rhs: rhs pharoCode: aString [
 
 	^ self new
@@ -64,7 +66,7 @@ StRewriterRuleHolder class >> lhs: lhs rhs: rhs pharoCode: aString [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRuleHolder >> initialize [
 
 	super initialize.
@@ -72,61 +74,61 @@ StRewriterRuleHolder >> initialize [
 	pharoCode := ''
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleHolder >> isRuleForMethod [
 
 	^ isForMethod
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleHolder >> isRuleForMethod: anObject [
 
 	isForMethod := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleHolder >> lhs [
 
 	^ lhs
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleHolder >> lhs: anObject [
 
 	lhs := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleHolder >> name [
 
 	^ name
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleHolder >> name: aString [
 
 	name := aString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleHolder >> pharoCode [
 
 	^ pharoCode
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleHolder >> pharoCode: anObject [
 
 	pharoCode := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleHolder >> rhs [
 
 	^ rhs
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleHolder >> rhs: anObject [
 
 	rhs := anObject
diff --git a/src/NewTools-RewriterTools-Backend/package.st b/src/NewTools-RewriterTools-Backend/package.st
index e4b6b5edf..b8d7f1e67 100644
--- a/src/NewTools-RewriterTools-Backend/package.st
+++ b/src/NewTools-RewriterTools-Backend/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-RewriterTools-Backend' }
+Package { #name : 'NewTools-RewriterTools-Backend' }
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterAbstractToolTest.class.st b/src/NewTools-RewriterTools-Tests/StRewriterAbstractToolTest.class.st
index caf05b40d..19b1a098f 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterAbstractToolTest.class.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterAbstractToolTest.class.st
@@ -1,41 +1,43 @@
 Class {
-	#name : #StRewriterAbstractToolTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-RewriterTools-Tests-AbstractTestClass'
+	#name : 'StRewriterAbstractToolTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-RewriterTools-Tests-AbstractTestClass',
+	#package : 'NewTools-RewriterTools-Tests',
+	#tag : 'AbstractTestClass'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StRewriterAbstractToolTest class >> isAbstract [
 
 	^ self = StRewriterAbstractToolTest
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterAbstractToolTest >> testDescriptionText [
 
 	self assert: self toolClass descriptionText isString.
 	self assert: self toolClass descriptionText isNotEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterAbstractToolTest >> testIcon [
 
 	self assert: self toolClass icon isForm
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterAbstractToolTest >> testIconName [
 
 	self assert: self toolClass iconName isSymbol
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterAbstractToolTest >> testTitle [
 
 	self deny: self toolClass title equals: 'Untitled window'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterAbstractToolTest >> toolClass [
 
 	^ self subclassResponsibility
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterExpressionFinderPresenterTest.class.st b/src/NewTools-RewriterTools-Tests/StRewriterExpressionFinderPresenterTest.class.st
index 104f85162..d7939dce0 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterExpressionFinderPresenterTest.class.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterExpressionFinderPresenterTest.class.st
@@ -2,29 +2,31 @@
 An ExpressionFinderPresenterTest is a test class for testing the behavior of ExpressionFinderPresenter
 "
 Class {
-	#name : #StRewriterExpressionFinderPresenterTest,
-	#superclass : #StRewriterAbstractToolTest,
+	#name : 'StRewriterExpressionFinderPresenterTest',
+	#superclass : 'StRewriterAbstractToolTest',
 	#instVars : [
 		'expressionFinder'
 	],
-	#category : #'NewTools-RewriterTools-Tests-ExpressionFinder'
+	#category : 'NewTools-RewriterTools-Tests-ExpressionFinder',
+	#package : 'NewTools-RewriterTools-Tests',
+	#tag : 'ExpressionFinder'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StRewriterExpressionFinderPresenterTest >> setUp [
 
 	super setUp.
 	expressionFinder := StRewriterExpressionFinderPresenter new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterExpressionFinderPresenterTest >> testPatternCode [
 
 	expressionFinder patternCode: 'A pattern'.
 	self assert: expressionFinder patternCode equals: 'A pattern'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterExpressionFinderPresenterTest >> toolClass [
 
 	^ StRewriterExpressionFinderPresenter
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterMatchToolPresenter.extension.st b/src/NewTools-RewriterTools-Tests/StRewriterMatchToolPresenter.extension.st
index 54130a533..594b1e2cb 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterMatchToolPresenter.extension.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterMatchToolPresenter.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #StRewriterMatchToolPresenter }
+Extension { #name : 'StRewriterMatchToolPresenter' }
 
-{ #category : #'*NewTools-RewriterTools-Tests' }
+{ #category : '*NewTools-RewriterTools-Tests' }
 StRewriterMatchToolPresenter >> astCode [
 
 	"This accessor should ONLY be called in the tests."
@@ -8,7 +8,7 @@ StRewriterMatchToolPresenter >> astCode [
 	^ astCode
 ]
 
-{ #category : #'*NewTools-RewriterTools-Tests' }
+{ #category : '*NewTools-RewriterTools-Tests' }
 StRewriterMatchToolPresenter >> astPattern [
 
 	"This accessor should ONLY be called in the tests."
@@ -16,7 +16,7 @@ StRewriterMatchToolPresenter >> astPattern [
 	^ astPattern
 ]
 
-{ #category : #'*NewTools-RewriterTools-Tests' }
+{ #category : '*NewTools-RewriterTools-Tests' }
 StRewriterMatchToolPresenter >> bindingsTable [
 
 	"This accessor should ONLY be called in the tests."
@@ -24,7 +24,7 @@ StRewriterMatchToolPresenter >> bindingsTable [
 	^ bindingsTable
 ]
 
-{ #category : #'*NewTools-RewriterTools-Tests' }
+{ #category : '*NewTools-RewriterTools-Tests' }
 StRewriterMatchToolPresenter >> codeEditor [
 
 	"This accessor should ONLY be called in the tests."
@@ -32,7 +32,7 @@ StRewriterMatchToolPresenter >> codeEditor [
 	^ codeEditor
 ]
 
-{ #category : #'*NewTools-RewriterTools-Tests' }
+{ #category : '*NewTools-RewriterTools-Tests' }
 StRewriterMatchToolPresenter >> matchesList [
 
 	"This accessor should ONLY be called in the tests. This is for not break encapsulation."
@@ -40,7 +40,7 @@ StRewriterMatchToolPresenter >> matchesList [
 	^ matchesList
 ]
 
-{ #category : #'*NewTools-RewriterTools-Tests' }
+{ #category : '*NewTools-RewriterTools-Tests' }
 StRewriterMatchToolPresenter >> methodCheckbox [
 
 	"This accessor should ONLY be called in the tests. This is for not break encapsulation."
@@ -48,7 +48,7 @@ StRewriterMatchToolPresenter >> methodCheckbox [
 	^ methodCheckbox
 ]
 
-{ #category : #'*NewTools-RewriterTools-Tests' }
+{ #category : '*NewTools-RewriterTools-Tests' }
 StRewriterMatchToolPresenter >> ruleEditor [
 
 	"This accessor should ONLY be called in the tests."
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterMatchToolPresenterTest.class.st b/src/NewTools-RewriterTools-Tests/StRewriterMatchToolPresenterTest.class.st
index 668e94260..6e5dc9a4a 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterMatchToolPresenterTest.class.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterMatchToolPresenterTest.class.st
@@ -1,20 +1,22 @@
 Class {
-	#name : #StRewriterMatchToolPresenterTest,
-	#superclass : #StRewriterAbstractToolTest,
+	#name : 'StRewriterMatchToolPresenterTest',
+	#superclass : 'StRewriterAbstractToolTest',
 	#instVars : [
 		'matchToolPresenter'
 	],
-	#category : #'NewTools-RewriterTools-Tests-MatchTool'
+	#category : 'NewTools-RewriterTools-Tests-MatchTool',
+	#package : 'NewTools-RewriterTools-Tests',
+	#tag : 'MatchTool'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StRewriterMatchToolPresenterTest >> setUp [
 
 	super setUp.
 	matchToolPresenter := StRewriterMatchToolPresenter new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterMatchToolPresenterTest >> testAddIconToTheme [
 
 	| icon |
@@ -22,7 +24,7 @@ StRewriterMatchToolPresenterTest >> testAddIconToTheme [
 	self deny: icon equals: (self iconNamed: #blackIcon)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterMatchToolPresenterTest >> testBindingsTableContainsMatchings [
 
 	"This test tests is the bindings table was populated with the correct matchings.
@@ -53,7 +55,7 @@ StRewriterMatchToolPresenterTest >> testBindingsTableContainsMatchings [
 		equals: 'x = y ifTrue: [ aBlock ]'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterMatchToolPresenterTest >> testEmptyLists [
 
 	matchToolPresenter emptyLists.
@@ -61,7 +63,7 @@ StRewriterMatchToolPresenterTest >> testEmptyLists [
 	self assertEmpty: matchToolPresenter matchesList items
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterMatchToolPresenterTest >> testGetBindingsItemsForMatch [
 
 	| match |
@@ -80,7 +82,7 @@ StRewriterMatchToolPresenterTest >> testGetBindingsItemsForMatch [
 		(matchToolPresenter getBindingsItemsForMatch: match)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterMatchToolPresenterTest >> testInitializePresenters [
 
 	self assert: matchToolPresenter methodCheckbox class equals: SpCheckBoxPresenter.
@@ -92,7 +94,7 @@ StRewriterMatchToolPresenterTest >> testInitializePresenters [
 	self assert: matchToolPresenter ruleEditor lhs isNotEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterMatchToolPresenterTest >> testMatchMethod [
 
 	matchToolPresenter
@@ -120,14 +122,14 @@ StRewriterMatchToolPresenterTest >> testMatchMethod [
 		equals: 'var'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterMatchToolPresenterTest >> testMatchesChanged [
 
 	matchToolPresenter matchesChanged.
 	self assertEmpty: matchToolPresenter bindingsTable items
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterMatchToolPresenterTest >> testMatchingTableContainsMatchings [
 
 	"This test tests is the matching table was populated with the correct matchings.
@@ -147,14 +149,14 @@ StRewriterMatchToolPresenterTest >> testMatchingTableContainsMatchings [
 		equals: 'x = y ifTrue: [ aBlock ]'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterMatchToolPresenterTest >> testPatternCode [
 
 	matchToolPresenter patternCode: '`var'.
 	self assert: matchToolPresenter patternCode equals: '`var'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterMatchToolPresenterTest >> testPerformMatching [
 
 	"This test tests if the match lists contain the adequate number of matching. The other tests see if the tables are populated correctly."
@@ -168,7 +170,7 @@ StRewriterMatchToolPresenterTest >> testPerformMatching [
 	self assert: matchToolPresenter bindingsTable items size equals: 2
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterMatchToolPresenterTest >> testPharoCode [
 
 	matchToolPresenter pharoCode: 'OrderedCollection new'.
@@ -177,7 +179,7 @@ StRewriterMatchToolPresenterTest >> testPharoCode [
 		equals: 'OrderedCollection new'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterMatchToolPresenterTest >> toolClass [
 
 	^ StRewriterMatchToolPresenter
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterOccurrencesBrowserPresenterTest.class.st b/src/NewTools-RewriterTools-Tests/StRewriterOccurrencesBrowserPresenterTest.class.st
index e3a5f919e..73d28d4c3 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterOccurrencesBrowserPresenterTest.class.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterOccurrencesBrowserPresenterTest.class.st
@@ -2,22 +2,24 @@
 An OccurrencesBrowserPresenterTest is a test class for testing the behavior of OccurrencesBrowserPresenter
 "
 Class {
-	#name : #StRewriterOccurrencesBrowserPresenterTest,
-	#superclass : #TestCase,
+	#name : 'StRewriterOccurrencesBrowserPresenterTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'occurrencesBrowserPresenter'
 	],
-	#category : #'NewTools-RewriterTools-Tests-OcurrencesBrowser'
+	#category : 'NewTools-RewriterTools-Tests-OcurrencesBrowser',
+	#package : 'NewTools-RewriterTools-Tests',
+	#tag : 'OcurrencesBrowser'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StRewriterOccurrencesBrowserPresenterTest >> setUp [
 
 	super setUp.
 	occurrencesBrowserPresenter := StRewriterOccurrencesBrowserPresenter new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterOccurrencesBrowserPresenterTest >> testCritiques [
 
 	| presenter |
@@ -25,7 +27,7 @@ StRewriterOccurrencesBrowserPresenterTest >> testCritiques [
 	self assert: (presenter isKindOf: SpPresenter)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterOccurrencesBrowserPresenterTest >> testTitle [
 
 	self deny: StRewriterOccurrencesBrowserPresenter title equals: 'Untitled window'
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterReplaceWithPanelTest.class.st b/src/NewTools-RewriterTools-Tests/StRewriterReplaceWithPanelTest.class.st
index d6dedb7fa..7bc40573b 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterReplaceWithPanelTest.class.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterReplaceWithPanelTest.class.st
@@ -2,22 +2,24 @@
 A RTReplaceWithPanelTest is a test class for testing the behavior of RTReplaceWithPanel
 "
 Class {
-	#name : #StRewriterReplaceWithPanelTest,
-	#superclass : #TestCase,
+	#name : 'StRewriterReplaceWithPanelTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'replacePanel'
 	],
-	#category : #'NewTools-RewriterTools-Tests-Panels'
+	#category : 'NewTools-RewriterTools-Tests-Panels',
+	#package : 'NewTools-RewriterTools-Tests',
+	#tag : 'Panels'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StRewriterReplaceWithPanelTest >> setUp [
 
 	super setUp.
 	replacePanel := StRewriterReplaceWithPanelPresenter new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterReplaceWithPanelTest >> testRhs [
 
 	replacePanel rhs: 'Some code'.
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterRuleEditorPresenterTest.class.st b/src/NewTools-RewriterTools-Tests/StRewriterRuleEditorPresenterTest.class.st
index 17cc792a4..d599dfda7 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterRuleEditorPresenterTest.class.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterRuleEditorPresenterTest.class.st
@@ -1,20 +1,22 @@
 Class {
-	#name : #StRewriterRuleEditorPresenterTest,
-	#superclass : #StRewriterAbstractToolTest,
+	#name : 'StRewriterRuleEditorPresenterTest',
+	#superclass : 'StRewriterAbstractToolTest',
 	#instVars : [
 		'rewriteBasicEditor'
 	],
-	#category : #'NewTools-RewriterTools-Tests-BasicEditor'
+	#category : 'NewTools-RewriterTools-Tests-BasicEditor',
+	#package : 'NewTools-RewriterTools-Tests',
+	#tag : 'BasicEditor'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StRewriterRuleEditorPresenterTest >> setUp [
 
 	super setUp.
 	rewriteBasicEditor := StRewriterRuleEditorPresenter new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterRuleEditorPresenterTest >> testReplaceWithPatternCode [
 
 	rewriteBasicEditor rhs: 'patternCode'.
@@ -23,7 +25,7 @@ StRewriterRuleEditorPresenterTest >> testReplaceWithPatternCode [
 		equals: 'patternCode'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterRuleEditorPresenterTest >> testRuleLoadsCorrectly [
 
 	| ruleHolder |
@@ -37,7 +39,7 @@ StRewriterRuleEditorPresenterTest >> testRuleLoadsCorrectly [
 	self	assert: rewriteBasicEditor rhs equals: ruleHolder rhs
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterRuleEditorPresenterTest >> testSearchForPatternCode [
 
 	rewriteBasicEditor lhs: 'patternCode'.
@@ -46,7 +48,7 @@ StRewriterRuleEditorPresenterTest >> testSearchForPatternCode [
 		equals: 'patternCode'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleEditorPresenterTest >> toolClass [
 
 	^ StRewriterRuleEditorPresenter
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterRuleLoaderPresenter.extension.st b/src/NewTools-RewriterTools-Tests/StRewriterRuleLoaderPresenter.extension.st
index 34336c596..f49d3a26b 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterRuleLoaderPresenter.extension.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterRuleLoaderPresenter.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #StRewriterRuleLoaderPresenter }
+Extension { #name : 'StRewriterRuleLoaderPresenter' }
 
-{ #category : #'*NewTools-RewriterTools-Tests' }
+{ #category : '*NewTools-RewriterTools-Tests' }
 StRewriterRuleLoaderPresenter >> rulesTableSelector [
 
 	^ rulesTableSelector
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterRuleLoaderPresenterTest.class.st b/src/NewTools-RewriterTools-Tests/StRewriterRuleLoaderPresenterTest.class.st
index c9e9ca2b9..661be1f36 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterRuleLoaderPresenterTest.class.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterRuleLoaderPresenterTest.class.st
@@ -1,20 +1,22 @@
 Class {
-	#name : #StRewriterRuleLoaderPresenterTest,
-	#superclass : #StRewriterAbstractToolTest,
+	#name : 'StRewriterRuleLoaderPresenterTest',
+	#superclass : 'StRewriterAbstractToolTest',
 	#instVars : [
 		'ruleLoader'
 	],
-	#category : #'NewTools-RewriterTools-Tests-RuleLoader'
+	#category : 'NewTools-RewriterTools-Tests-RuleLoader',
+	#package : 'NewTools-RewriterTools-Tests',
+	#tag : 'RuleLoader'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StRewriterRuleLoaderPresenterTest >> setUp [
 
 	super setUp.
 	ruleLoader := StRewriterRuleLoaderPresenter new
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleLoaderPresenterTest >> toolClass [
 
 	^ StRewriterRuleLoaderPresenter
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterRulesHelpPresenterTest.class.st b/src/NewTools-RewriterTools-Tests/StRewriterRulesHelpPresenterTest.class.st
index fce6c890f..c2d7276b0 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterRulesHelpPresenterTest.class.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterRulesHelpPresenterTest.class.st
@@ -2,15 +2,17 @@
 A RewriteRulesHelpPresenterTest is a test class for testing the behavior of RewriteRulesHelpPresenter
 "
 Class {
-	#name : #StRewriterRulesHelpPresenterTest,
-	#superclass : #StRewriterAbstractToolTest,
+	#name : 'StRewriterRulesHelpPresenterTest',
+	#superclass : 'StRewriterAbstractToolTest',
 	#instVars : [
 		'rulesHelper'
 	],
-	#category : #'NewTools-RewriterTools-Tests-HelpBrowser'
+	#category : 'NewTools-RewriterTools-Tests-HelpBrowser',
+	#package : 'NewTools-RewriterTools-Tests',
+	#tag : 'HelpBrowser'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StRewriterRulesHelpPresenterTest >> setUp [
 
 	super setUp.
@@ -18,7 +20,7 @@ StRewriterRulesHelpPresenterTest >> setUp [
 	rulesHelper := StRewriterHelpBrowserPresenter new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterRulesHelpPresenterTest >> testCreateTextMorph [
 
 	| morph |
@@ -26,7 +28,7 @@ StRewriterRulesHelpPresenterTest >> testCreateTextMorph [
 	self assert: (morph isMemberOf: RubScrolledTextMorph)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterRulesHelpPresenterTest >> testGetMicrodownParsedText [
 
 	| aText |
@@ -34,7 +36,7 @@ StRewriterRulesHelpPresenterTest >> testGetMicrodownParsedText [
 	self assert: aText isNotEmpty
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRulesHelpPresenterTest >> toolClass [
 
 	^ StRewriterRuleLoaderPresenter
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterRulesTableSelectorPresenter.extension.st b/src/NewTools-RewriterTools-Tests/StRewriterRulesTableSelectorPresenter.extension.st
index d76252a8d..47cd94e16 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterRulesTableSelectorPresenter.extension.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterRulesTableSelectorPresenter.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #StRewriterRulesTableSelectorPresenter }
+Extension { #name : 'StRewriterRulesTableSelectorPresenter' }
 
-{ #category : #'*NewTools-RewriterTools-Tests' }
+{ #category : '*NewTools-RewriterTools-Tests' }
 StRewriterRulesTableSelectorPresenter >> rulesTable [
 
 	^ rulesTable
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterScopeSelectorPresenter.extension.st b/src/NewTools-RewriterTools-Tests/StRewriterScopeSelectorPresenter.extension.st
index 0efa5ce33..cf5ecc623 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterScopeSelectorPresenter.extension.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterScopeSelectorPresenter.extension.st
@@ -1,18 +1,18 @@
-Extension { #name : #StRewriterScopeSelectorPresenter }
+Extension { #name : 'StRewriterScopeSelectorPresenter' }
 
-{ #category : #'*NewTools-RewriterTools-Tests' }
+{ #category : '*NewTools-RewriterTools-Tests' }
 StRewriterScopeSelectorPresenter >> classesFilteringListPresenter [
 
 	^ classesListWithFilterPresenter
 ]
 
-{ #category : #'*NewTools-RewriterTools-Tests' }
+{ #category : '*NewTools-RewriterTools-Tests' }
 StRewriterScopeSelectorPresenter >> methodsFilteringListPresenter [
 
 	^ methodsListWithFilterPresenter
 ]
 
-{ #category : #'*NewTools-RewriterTools-Tests' }
+{ #category : '*NewTools-RewriterTools-Tests' }
 StRewriterScopeSelectorPresenter >> packagesFilteringListPresenter [
 
 	^ packagesListWithFilterPresenter
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterScopeSelectorPresenterTest.class.st b/src/NewTools-RewriterTools-Tests/StRewriterScopeSelectorPresenterTest.class.st
index a5e9a006d..bcd7b83db 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterScopeSelectorPresenterTest.class.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterScopeSelectorPresenterTest.class.st
@@ -2,22 +2,24 @@
 A MethodsSelectorPresenterTest is a test class for testing the behavior of MethodsSelectorPresenter
 "
 Class {
-	#name : #StRewriterScopeSelectorPresenterTest,
-	#superclass : #TestCase,
+	#name : 'StRewriterScopeSelectorPresenterTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'scopeSelectorPresenter'
 	],
-	#category : #'NewTools-RewriterTools-Tests-ScopeSelector'
+	#category : 'NewTools-RewriterTools-Tests-ScopeSelector',
+	#package : 'NewTools-RewriterTools-Tests',
+	#tag : 'ScopeSelector'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StRewriterScopeSelectorPresenterTest >> setUp [
 
 	super setUp.
 	scopeSelectorPresenter := StRewriterScopeSelectorPresenter new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterScopeSelectorPresenterTest >> testInitializePresenters [
 
 	| window |
@@ -30,7 +32,7 @@ StRewriterScopeSelectorPresenterTest >> testInitializePresenters [
 	window close
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterScopeSelectorPresenterTest >> testInitializeWithPackages [
 
 	| newPresenter packages |
@@ -42,7 +44,7 @@ StRewriterScopeSelectorPresenterTest >> testInitializeWithPackages [
 		hasSameElements: packages
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterScopeSelectorPresenterTest >> testPackagesChanged [
 
 	| selectedPackages |
@@ -74,7 +76,7 @@ StRewriterScopeSelectorPresenterTest >> testPackagesChanged [
 	self assert: scopeSelectorPresenter selectedMethods size equals: 5"
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterScopeSelectorPresenterTest >> testSelectedMethods [
 
 	self assertEmpty: scopeSelectorPresenter selectedMethods.
@@ -83,7 +85,7 @@ StRewriterScopeSelectorPresenterTest >> testSelectedMethods [
 	self assert: scopeSelectorPresenter selectedMethods isNotEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterScopeSelectorPresenterTest >> testWithPackages [
 
 	| newPresenter packages |
diff --git a/src/NewTools-RewriterTools-Tests/StRewriterSearchForPanelTest.class.st b/src/NewTools-RewriterTools-Tests/StRewriterSearchForPanelTest.class.st
index a5eb926a6..12e45ded1 100644
--- a/src/NewTools-RewriterTools-Tests/StRewriterSearchForPanelTest.class.st
+++ b/src/NewTools-RewriterTools-Tests/StRewriterSearchForPanelTest.class.st
@@ -2,22 +2,24 @@
 A RTSearchForPanelTest is a test class for testing the behavior of RTSearchForPanel
 "
 Class {
-	#name : #StRewriterSearchForPanelTest,
-	#superclass : #TestCase,
+	#name : 'StRewriterSearchForPanelTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'searchPanel'
 	],
-	#category : #'NewTools-RewriterTools-Tests-Panels'
+	#category : 'NewTools-RewriterTools-Tests-Panels',
+	#package : 'NewTools-RewriterTools-Tests',
+	#tag : 'Panels'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StRewriterSearchForPanelTest >> setUp [
 
 	super setUp.
 	searchPanel := StRewriterSearchForPanelPresenter new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StRewriterSearchForPanelTest >> testLhs [
 
 	searchPanel lhs: 'Some code'.
diff --git a/src/NewTools-RewriterTools-Tests/package.st b/src/NewTools-RewriterTools-Tests/package.st
index a0a534a57..2fe35950e 100644
--- a/src/NewTools-RewriterTools-Tests/package.st
+++ b/src/NewTools-RewriterTools-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-RewriterTools-Tests' }
+Package { #name : 'NewTools-RewriterTools-Tests' }
diff --git a/src/NewTools-RewriterTools/Array.extension.st b/src/NewTools-RewriterTools/Array.extension.st
index c24b6638f..88ae0418f 100644
--- a/src/NewTools-RewriterTools/Array.extension.st
+++ b/src/NewTools-RewriterTools/Array.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #Array }
+Extension { #name : 'Array' }
 
-{ #category : #'*NewTools-RewriterTools' }
+{ #category : '*NewTools-RewriterTools' }
 Array >> formattedCode [
 
 	^ self
diff --git a/src/NewTools-RewriterTools/StRewriterApplyRuleOnAllClassesCommand.class.st b/src/NewTools-RewriterTools/StRewriterApplyRuleOnAllClassesCommand.class.st
index a68b7218a..4f5437f97 100644
--- a/src/NewTools-RewriterTools/StRewriterApplyRuleOnAllClassesCommand.class.st
+++ b/src/NewTools-RewriterTools/StRewriterApplyRuleOnAllClassesCommand.class.st
@@ -4,30 +4,32 @@ I am a command that applies the rule that is already present on the presenter to
 I can be converted into a sepc button to be used in a presenter
 "
 Class {
-	#name : #StRewriterApplyRuleOnAllClassesCommand,
-	#superclass : #StCommand,
-	#category : #'NewTools-RewriterTools-Commands'
+	#name : 'StRewriterApplyRuleOnAllClassesCommand',
+	#superclass : 'StCommand',
+	#category : 'NewTools-RewriterTools-Commands',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Commands'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterApplyRuleOnAllClassesCommand class >> defaultDescription [
 
 	^ 'Apply the current rewrite rule that is on this tool to all classes in the system.'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterApplyRuleOnAllClassesCommand class >> defaultIconName [
 
 	^ StRewriterScopeSelectorPresenter iconName
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterApplyRuleOnAllClassesCommand class >> defaultName [
 
 	^ 'Transform all classes'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StRewriterApplyRuleOnAllClassesCommand >> execute [
 
 	| changes ruleHolder |
diff --git a/src/NewTools-RewriterTools/StRewriterApplyRuleOnSelectedClassesCommand.class.st b/src/NewTools-RewriterTools/StRewriterApplyRuleOnSelectedClassesCommand.class.st
index 92cf2eb51..b3a76adbd 100644
--- a/src/NewTools-RewriterTools/StRewriterApplyRuleOnSelectedClassesCommand.class.st
+++ b/src/NewTools-RewriterTools/StRewriterApplyRuleOnSelectedClassesCommand.class.st
@@ -4,30 +4,32 @@ I am a command that applies the rule that is already present on the presenter to
 I can be converted into a sepc button to be used in a presenter
 "
 Class {
-	#name : #StRewriterApplyRuleOnSelectedClassesCommand,
-	#superclass : #StCommand,
-	#category : #'NewTools-RewriterTools-Commands'
+	#name : 'StRewriterApplyRuleOnSelectedClassesCommand',
+	#superclass : 'StCommand',
+	#category : 'NewTools-RewriterTools-Commands',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Commands'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterApplyRuleOnSelectedClassesCommand class >> defaultDescription [
 
 	^ 'Apply the current rewrite rule that is on this tool a selected scope.'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterApplyRuleOnSelectedClassesCommand class >> defaultIconName [
 
 	^ StRewriterScopeSelectorPresenter iconName
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterApplyRuleOnSelectedClassesCommand class >> defaultName [
 
 	^ 'Transform selected classes'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StRewriterApplyRuleOnSelectedClassesCommand >> execute [
 
 	| dialogWindow changes |
diff --git a/src/NewTools-RewriterTools/StRewriterCheatSheetPresenter.class.st b/src/NewTools-RewriterTools/StRewriterCheatSheetPresenter.class.st
index 8b1a23261..dee893577 100644
--- a/src/NewTools-RewriterTools/StRewriterCheatSheetPresenter.class.st
+++ b/src/NewTools-RewriterTools/StRewriterCheatSheetPresenter.class.st
@@ -2,16 +2,18 @@
 I am a cheat sheet for showing help for the rewriting rules
 "
 Class {
-	#name : #StRewriterCheatSheetPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StRewriterCheatSheetPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'textPresenter',
 		'helpButton'
 	],
-	#category : #'NewTools-RewriterTools-Help'
+	#category : 'NewTools-RewriterTools-Help',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Help'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 StRewriterCheatSheetPresenter >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
@@ -20,7 +22,7 @@ StRewriterCheatSheetPresenter >> defaultLayout [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterCheatSheetPresenter >> helpText [
 
 	^ '` = meta var
@@ -34,7 +36,7 @@ StRewriterCheatSheetPresenter >> helpText [
 # = literal'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterCheatSheetPresenter >> initializePresenters [
 
 	textPresenter := self newText.
@@ -47,7 +49,7 @@ StRewriterCheatSheetPresenter >> initializePresenters [
 	self initializeStyles
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterCheatSheetPresenter >> initializeStyles [
 
 	textPresenter addStyle: 'bgOpaque'
diff --git a/src/NewTools-RewriterTools/StRewriterExpressionFinderPresenter.class.st b/src/NewTools-RewriterTools/StRewriterExpressionFinderPresenter.class.st
index 93104f260..4e062bbc9 100644
--- a/src/NewTools-RewriterTools/StRewriterExpressionFinderPresenter.class.st
+++ b/src/NewTools-RewriterTools/StRewriterExpressionFinderPresenter.class.st
@@ -2,8 +2,8 @@
 I am a presenter that finds all the ocurrenses of a pattern code in all the methods that are in the Pharo image.
 "
 Class {
-	#name : #StRewriterExpressionFinderPresenter,
-	#superclass : #StPresenter,
+	#name : 'StRewriterExpressionFinderPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'patternCodePresenter',
 		'searchButton',
@@ -11,28 +11,30 @@ Class {
 		'searchOnAllClassesButton',
 		'scopeSelectorPresenter'
 	],
-	#category : #'NewTools-RewriterTools-ExpressionFinder'
+	#category : 'NewTools-RewriterTools-ExpressionFinder',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'ExpressionFinder'
 }
 
-{ #category : #'world menu' }
+{ #category : 'world menu' }
 StRewriterExpressionFinderPresenter class >> descriptionText [
 
 	^ 'A tool to search the ocurrences of a rewrite rule within the Pharo image'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterExpressionFinderPresenter class >> icon [
 
 	^ self iconNamed: self iconName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterExpressionFinderPresenter class >> iconName [
 
 	^ #smallFind
 ]
 
-{ #category : #'world menu' }
+{ #category : 'world menu' }
 StRewriterExpressionFinderPresenter class >> menuCommandOn: aBuilder [
 
 	<worldMenu>
@@ -44,20 +46,20 @@ StRewriterExpressionFinderPresenter class >> menuCommandOn: aBuilder [
 		help: self descriptionText
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StRewriterExpressionFinderPresenter class >> title [
 
 	^ 'Expression Finder'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterExpressionFinderPresenter >> connectPresenters [
 
 	searchButton action: [ self searchExpression ].
 	searchOnAllClassesButton action: [ self searchExpressionOnAllClasses ]
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StRewriterExpressionFinderPresenter >> defaultLayout [
 
 	^ SpPanedLayout newLeftToRight
@@ -71,7 +73,7 @@ StRewriterExpressionFinderPresenter >> defaultLayout [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterExpressionFinderPresenter >> initializePresenters [
 
 	patternCodePresenter := self instantiate: StRewriterSearchForPanelPresenter.
@@ -87,7 +89,7 @@ StRewriterExpressionFinderPresenter >> initializePresenters [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterExpressionFinderPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter
@@ -97,18 +99,18 @@ StRewriterExpressionFinderPresenter >> initializeWindow: aWindowPresenter [
 		askOkToClose: false
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterExpressionFinderPresenter >> patternCode [
 	^ patternCodePresenter lhs
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterExpressionFinderPresenter >> patternCode: aString [
 
 	patternCodePresenter lhs: aString
 ]
 
-{ #category : #action }
+{ #category : 'action' }
 StRewriterExpressionFinderPresenter >> searchExpression [
 
 	| ruleHolder critiques |
@@ -117,7 +119,7 @@ StRewriterExpressionFinderPresenter >> searchExpression [
 	^ (StRewriterOccurrencesBrowserPresenter critiques: critiques) open
 ]
 
-{ #category : #action }
+{ #category : 'action' }
 StRewriterExpressionFinderPresenter >> searchExpressionOnAllClasses [
 
 	| dialogWindow methods ruleHolder critiques |
diff --git a/src/NewTools-RewriterTools/StRewriterHelpBrowserPresenter.class.st b/src/NewTools-RewriterTools/StRewriterHelpBrowserPresenter.class.st
index 77c4a05c7..6942f0c04 100644
--- a/src/NewTools-RewriterTools/StRewriterHelpBrowserPresenter.class.st
+++ b/src/NewTools-RewriterTools/StRewriterHelpBrowserPresenter.class.st
@@ -2,15 +2,17 @@
 I am a helper browser that contains an explanation of what the rewrite rule are and how their syntax works.
 "
 Class {
-	#name : #StRewriterHelpBrowserPresenter,
-	#superclass : #StPresenter,
+	#name : 'StRewriterHelpBrowserPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'morphPresenter'
 	],
-	#category : #'NewTools-RewriterTools-Help'
+	#category : 'NewTools-RewriterTools-Help',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Help'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterHelpBrowserPresenter class >> basicPatterns [
 
 	^ '(\`) BASIC PATTERN NODES
@@ -35,7 +37,7 @@ that will match any method which returns nil.
 '
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterHelpBrowserPresenter class >> blockPatterns [
 
 	^ '(`{ }) BLOCK PATTERN NODES
@@ -61,7 +63,7 @@ In this case first `#(1 2 3)` will be matched by the literal node and then teste
 '
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterHelpBrowserPresenter class >> getParsedText [
 
 	^ String streamContents: [ :stream |
@@ -77,7 +79,7 @@ StRewriterHelpBrowserPresenter class >> getParsedText [
 			<< self thanks]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterHelpBrowserPresenter class >> issues [
 
 	^ 'ISSUES?
@@ -88,7 +90,7 @@ StRewriterHelpBrowserPresenter class >> issues [
 '
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterHelpBrowserPresenter class >> listPatterns [
 
 	^ '(\`@) LIST PATTERN NODES
@@ -145,7 +147,7 @@ name looks nicer this way.
 '
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterHelpBrowserPresenter class >> literalPatterns [
 
 	^ '(\`\#) LITERAL PATTERN NODES
@@ -156,7 +158,7 @@ For variables backtick can be followed by hash to enforce that matched receiver
 '
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterHelpBrowserPresenter class >> namingImportant [
 
 	^ 'NAMING IS IMPORTANT
@@ -171,7 +173,7 @@ arguments. It is like that because we used the same pattern variable name.
 '
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterHelpBrowserPresenter class >> patternCodeIntro [
 
 	^ 'PATTERN CODE INTRODUCTION
@@ -196,7 +198,7 @@ The following sections will go over different kinds of wildcards (pattern nodes)
 '
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterHelpBrowserPresenter class >> statementPatterns [
 
 	^ '(\`.) STATEMENT PATTERN NODES
@@ -212,7 +214,7 @@ only one statement each.
 '
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterHelpBrowserPresenter class >> thanks [
 
 	^ '
@@ -222,7 +224,7 @@ Also thanks to him for writing this help description.
 	'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterHelpBrowserPresenter class >> whatNext [
 
 	^ 'WHAT IS NEXT?
@@ -234,7 +236,7 @@ Especially read: `Rules > Creating Rules > Special Rules > ReNodeMatchRule`
 '
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterHelpBrowserPresenter >> createTextMorph [
 
 	^ RubScrolledTextMorph new
@@ -243,7 +245,7 @@ StRewriterHelpBrowserPresenter >> createTextMorph [
 		  yourself
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StRewriterHelpBrowserPresenter >> defaultLayout [
 
 	^ SpBoxLayout newLeftToRight
@@ -251,7 +253,7 @@ StRewriterHelpBrowserPresenter >> defaultLayout [
 		  yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterHelpBrowserPresenter >> initializePresenters [
 
 	morphPresenter := self newMorph
@@ -260,7 +262,7 @@ StRewriterHelpBrowserPresenter >> initializePresenters [
 	morphPresenter addStyle: 'bgOpaque'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterHelpBrowserPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter
diff --git a/src/NewTools-RewriterTools/StRewriterMatchToolPresenter.class.st b/src/NewTools-RewriterTools/StRewriterMatchToolPresenter.class.st
index dcad4369d..bb9882998 100644
--- a/src/NewTools-RewriterTools/StRewriterMatchToolPresenter.class.st
+++ b/src/NewTools-RewriterTools/StRewriterMatchToolPresenter.class.st
@@ -7,8 +7,8 @@ Write the pattern's code and the Pharo's code in the code editors and then press
 - The right column shows all the bindings of the selected matched of the middle column.
 "
 Class {
-	#name : #StRewriterMatchToolPresenter,
-	#superclass : #StPresenter,
+	#name : 'StRewriterMatchToolPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'executeButton',
 		'ruleEditor',
@@ -20,21 +20,23 @@ Class {
 		'astPattern',
 		'astCode'
 	],
-	#category : #'NewTools-RewriterTools-MatchTool'
+	#category : 'NewTools-RewriterTools-MatchTool',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'MatchTool'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterMatchToolPresenter class >> descriptionText [
 	^ 'MatchTool is a simple UI for experimenting with the matching functionality of a rewrite rule'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterMatchToolPresenter class >> icon [
 
 	^ self iconNamed: self iconName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterMatchToolPresenter class >> iconName [
 
 	| iconContent |
@@ -47,7 +49,7 @@ StRewriterMatchToolPresenter class >> iconName [
 	^ #jigsawIcon
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 StRewriterMatchToolPresenter class >> menuCommandOn: aBuilder [
 
 	<worldMenu>
@@ -59,13 +61,13 @@ StRewriterMatchToolPresenter class >> menuCommandOn: aBuilder [
 		icon: self icon
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StRewriterMatchToolPresenter class >> title [
 
 	^ 'Match Tool'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterMatchToolPresenter >> connectPresenters [
 
 	matchesList
@@ -75,7 +77,7 @@ StRewriterMatchToolPresenter >> connectPresenters [
 	executeButton action: [ self performMatching ]
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StRewriterMatchToolPresenter >> defaultLayout [
 
 	| rulePanel codePanel matchesWithLabelPanel |
@@ -108,14 +110,14 @@ StRewriterMatchToolPresenter >> defaultLayout [
 		yourself
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StRewriterMatchToolPresenter >> emptyLists [
 
 	bindingsTable items: #(  ).
 	matchesList items: #(  )
 ]
 
-{ #category : #defaults }
+{ #category : 'defaults' }
 StRewriterMatchToolPresenter >> getBindingsItemsForMatch: bindingsAssociation [
 
 	| newItems |
@@ -127,7 +129,7 @@ StRewriterMatchToolPresenter >> getBindingsItemsForMatch: bindingsAssociation [
 	^ newItems flattened
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterMatchToolPresenter >> initializeButtons [
 
 	executeButton := self newButton.
@@ -137,7 +139,7 @@ StRewriterMatchToolPresenter >> initializeButtons [
 		shortcut: Character cr meta
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterMatchToolPresenter >> initializeEditors [
 
 	methodCheckbox := self newCheckBox label: 'The rule is for a method?'.
@@ -153,7 +155,7 @@ StRewriterMatchToolPresenter >> initializeEditors [
 	ruleEditor := self instantiate: StRewriterSearchForPanelPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterMatchToolPresenter >> initializeMatchesPresenters [
 
 	matchesList := self newList.
@@ -170,7 +172,7 @@ StRewriterMatchToolPresenter >> initializeMatchesPresenters [
 		beResizable
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterMatchToolPresenter >> initializePresenters [
 
 	self initializeEditors.
@@ -178,7 +180,7 @@ StRewriterMatchToolPresenter >> initializePresenters [
 	self initializeMatchesPresenters
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterMatchToolPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter
@@ -189,26 +191,26 @@ StRewriterMatchToolPresenter >> initializeWindow: aWindowPresenter [
 		aboutText: self class descriptionText
 ]
 
-{ #category : #'event handling' }
+{ #category : 'event handling' }
 StRewriterMatchToolPresenter >> matchesChanged [
 
 	bindingsTable items: #(  ).
 	matchesList unselectAll
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterMatchToolPresenter >> patternCode [
 
 	^ ruleEditor lhs
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterMatchToolPresenter >> patternCode: aPatternCode [
 
 	ruleEditor lhs: aPatternCode
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StRewriterMatchToolPresenter >> performMatching [
 
 	| matches |
@@ -222,19 +224,19 @@ StRewriterMatchToolPresenter >> performMatching [
 	matchesList items: matches
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterMatchToolPresenter >> pharoCode [
 
 	^ codeEditor text
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterMatchToolPresenter >> pharoCode: aPharoCode [
 
 	codeEditor text: aPharoCode
 ]
 
-{ #category : #'event handling' }
+{ #category : 'event handling' }
 StRewriterMatchToolPresenter >> selectedMatchChanged: selection [
 
 	| selectedMatch |
diff --git a/src/NewTools-RewriterTools/StRewriterOccurrencesBrowserPresenter.class.st b/src/NewTools-RewriterTools/StRewriterOccurrencesBrowserPresenter.class.st
index 484701a07..1260e5444 100644
--- a/src/NewTools-RewriterTools/StRewriterOccurrencesBrowserPresenter.class.st
+++ b/src/NewTools-RewriterTools/StRewriterOccurrencesBrowserPresenter.class.st
@@ -2,16 +2,18 @@
 I am a presenter for displaying the ocurrences found by `ExpressionFinderPresenter`
 "
 Class {
-	#name : #StRewriterOccurrencesBrowserPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StRewriterOccurrencesBrowserPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'codePresenter',
 		'listPresenter'
 	],
-	#category : #'NewTools-RewriterTools-ChangesBrowser'
+	#category : 'NewTools-RewriterTools-ChangesBrowser',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'ChangesBrowser'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterOccurrencesBrowserPresenter class >> critiques: critiques [
 
 	^ self new
@@ -19,13 +21,13 @@ StRewriterOccurrencesBrowserPresenter class >> critiques: critiques [
 		yourself
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StRewriterOccurrencesBrowserPresenter class >> title [
 
 	^ 'Occurrences matches'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterOccurrencesBrowserPresenter >> connectPresenters [
 
 	listPresenter whenSelectedDo: [ :selectedItem |
@@ -33,13 +35,13 @@ StRewriterOccurrencesBrowserPresenter >> connectPresenters [
 		codePresenter selectionInterval: selectedItem sourceAnchor interval ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterOccurrencesBrowserPresenter >> critiques: critiques [
 
 	listPresenter items: critiques
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StRewriterOccurrencesBrowserPresenter >> defaultLayout [
 
 	^ SpPanedLayout newLeftToRight
@@ -49,7 +51,7 @@ StRewriterOccurrencesBrowserPresenter >> defaultLayout [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterOccurrencesBrowserPresenter >> initializePresenters [
 
 	codePresenter := self newCode.
@@ -61,7 +63,7 @@ StRewriterOccurrencesBrowserPresenter >> initializePresenters [
 		display: [ :item | item sourceAnchor entity printString ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterOccurrencesBrowserPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter
diff --git a/src/NewTools-RewriterTools/StRewriterOpenExpressionFinderCommand.class.st b/src/NewTools-RewriterTools/StRewriterOpenExpressionFinderCommand.class.st
index 23be7e944..e217dc034 100644
--- a/src/NewTools-RewriterTools/StRewriterOpenExpressionFinderCommand.class.st
+++ b/src/NewTools-RewriterTools/StRewriterOpenExpressionFinderCommand.class.st
@@ -4,30 +4,32 @@ I am a command that open the expression finder presenter from another presenter
 I can be converted into a sepc button to be used in a presenter
 "
 Class {
-	#name : #StRewriterOpenExpressionFinderCommand,
-	#superclass : #StCommand,
-	#category : #'NewTools-RewriterTools-Commands'
+	#name : 'StRewriterOpenExpressionFinderCommand',
+	#superclass : 'StCommand',
+	#category : 'NewTools-RewriterTools-Commands',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Commands'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterOpenExpressionFinderCommand class >> defaultDescription [
 
 	^ 'Find ocurrences of an expression in all Pharo''s code'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterOpenExpressionFinderCommand class >> defaultIconName [
 
 	^ StRewriterExpressionFinderPresenter iconName
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterOpenExpressionFinderCommand class >> defaultName [
 
 	^ 'Find occurrences'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StRewriterOpenExpressionFinderCommand >> execute [
 
 	| window |
diff --git a/src/NewTools-RewriterTools/StRewriterOpenHelpBrowserCommand.class.st b/src/NewTools-RewriterTools/StRewriterOpenHelpBrowserCommand.class.st
index 2a5674f01..47965ac72 100644
--- a/src/NewTools-RewriterTools/StRewriterOpenHelpBrowserCommand.class.st
+++ b/src/NewTools-RewriterTools/StRewriterOpenHelpBrowserCommand.class.st
@@ -4,30 +4,32 @@ I open the RT help browser presenter.
 I can be converted into a sepc button to be used in a presenter
 "
 Class {
-	#name : #StRewriterOpenHelpBrowserCommand,
-	#superclass : #StCommand,
-	#category : #'NewTools-RewriterTools-Commands'
+	#name : 'StRewriterOpenHelpBrowserCommand',
+	#superclass : 'StCommand',
+	#category : 'NewTools-RewriterTools-Commands',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Commands'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterOpenHelpBrowserCommand class >> defaultDescription [
 
 	^ 'Help browser'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterOpenHelpBrowserCommand class >> defaultIconName [
 
 	^ #smallQuestionIcon
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterOpenHelpBrowserCommand class >> defaultName [
 
 	^ 'More help'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StRewriterOpenHelpBrowserCommand >> execute [
 
 	| window |
diff --git a/src/NewTools-RewriterTools/StRewriterOpenMatchToolCommand.class.st b/src/NewTools-RewriterTools/StRewriterOpenMatchToolCommand.class.st
index e49c2da9d..9744f2695 100644
--- a/src/NewTools-RewriterTools/StRewriterOpenMatchToolCommand.class.st
+++ b/src/NewTools-RewriterTools/StRewriterOpenMatchToolCommand.class.st
@@ -4,30 +4,32 @@ I am a command that opens match tool presenter from another presenter keeping th
 I can be converted into a sepc button to be used in a presenter
 "
 Class {
-	#name : #StRewriterOpenMatchToolCommand,
-	#superclass : #StCommand,
-	#category : #'NewTools-RewriterTools-Commands'
+	#name : 'StRewriterOpenMatchToolCommand',
+	#superclass : 'StCommand',
+	#category : 'NewTools-RewriterTools-Commands',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Commands'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterOpenMatchToolCommand class >> defaultDescription [
 
 	^ 'Open MatchTool'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterOpenMatchToolCommand class >> defaultIconName [
 
 	^ StRewriterMatchToolPresenter iconName
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterOpenMatchToolCommand class >> defaultName [
 
 	^ 'Open Match Tool'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StRewriterOpenMatchToolCommand >> execute [
 
 	^ StRewriterMatchToolPresenter new
diff --git a/src/NewTools-RewriterTools/StRewriterOpenRuleEditorCommand.class.st b/src/NewTools-RewriterTools/StRewriterOpenRuleEditorCommand.class.st
index 7bad6c80d..61824b185 100644
--- a/src/NewTools-RewriterTools/StRewriterOpenRuleEditorCommand.class.st
+++ b/src/NewTools-RewriterTools/StRewriterOpenRuleEditorCommand.class.st
@@ -4,30 +4,32 @@ I am a command that opens the rt basic editor presenter from another presenter k
 I can be converted into a sepc button to be used in a presenter
 "
 Class {
-	#name : #StRewriterOpenRuleEditorCommand,
-	#superclass : #StCommand,
-	#category : #'NewTools-RewriterTools-Commands'
+	#name : 'StRewriterOpenRuleEditorCommand',
+	#superclass : 'StCommand',
+	#category : 'NewTools-RewriterTools-Commands',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Commands'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterOpenRuleEditorCommand class >> defaultDescription [
 
 	^ 'Open Rewrite Rule Editor'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterOpenRuleEditorCommand class >> defaultIconName [
 
 	^StRewriterRuleEditorPresenter iconName
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterOpenRuleEditorCommand class >> defaultName [
 
 	^ 'Open Rule Editor'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StRewriterOpenRuleEditorCommand >> execute [
 
 	| window |
diff --git a/src/NewTools-RewriterTools/StRewriterOpenRuleLoaderCommand.class.st b/src/NewTools-RewriterTools/StRewriterOpenRuleLoaderCommand.class.st
index 31b78610d..88179e0ea 100644
--- a/src/NewTools-RewriterTools/StRewriterOpenRuleLoaderCommand.class.st
+++ b/src/NewTools-RewriterTools/StRewriterOpenRuleLoaderCommand.class.st
@@ -4,30 +4,32 @@ I am a command that open the rt rule loader presenter from another presenter.
 I can be converted into a sepc button to be used in a presenter
 "
 Class {
-	#name : #StRewriterOpenRuleLoaderCommand,
-	#superclass : #StCommand,
-	#category : #'NewTools-RewriterTools-Commands'
+	#name : 'StRewriterOpenRuleLoaderCommand',
+	#superclass : 'StCommand',
+	#category : 'NewTools-RewriterTools-Commands',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Commands'
 }
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterOpenRuleLoaderCommand class >> defaultDescription [
 
 	^ 'Load an example Rewrite Rule'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterOpenRuleLoaderCommand class >> defaultIconName [
 
 	^ StRewriterRuleLoaderPresenter iconName
 ]
 
-{ #category : #default }
+{ #category : 'default' }
 StRewriterOpenRuleLoaderCommand class >> defaultName [
 
 	^ 'Load an example rule'
 ]
 
-{ #category : #executing }
+{ #category : 'executing' }
 StRewriterOpenRuleLoaderCommand >> execute [
 
 	| window |
diff --git a/src/NewTools-RewriterTools/StRewriterReplaceWithPanelPresenter.class.st b/src/NewTools-RewriterTools/StRewriterReplaceWithPanelPresenter.class.st
index f9e76b1c2..a40155f20 100644
--- a/src/NewTools-RewriterTools/StRewriterReplaceWithPanelPresenter.class.st
+++ b/src/NewTools-RewriterTools/StRewriterReplaceWithPanelPresenter.class.st
@@ -2,16 +2,18 @@
 I am the panel for the replace with (rhs) part of the rule
 "
 Class {
-	#name : #StRewriterReplaceWithPanelPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StRewriterReplaceWithPanelPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'label',
 		'codePresenter'
 	],
-	#category : #'NewTools-RewriterTools-Widgets'
+	#category : 'NewTools-RewriterTools-Widgets',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Widgets'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 StRewriterReplaceWithPanelPresenter >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
@@ -20,7 +22,7 @@ StRewriterReplaceWithPanelPresenter >> defaultLayout [
 		  yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterReplaceWithPanelPresenter >> initializePresenters [
 
 	label := self newLabel.
@@ -33,13 +35,13 @@ StRewriterReplaceWithPanelPresenter >> initializePresenters [
 		withoutLineNumbers
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterReplaceWithPanelPresenter >> rhs [
 
 	^ codePresenter text
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterReplaceWithPanelPresenter >> rhs: aString [
 
 	codePresenter text: aString
diff --git a/src/NewTools-RewriterTools/StRewriterRuleEditorPresenter.class.st b/src/NewTools-RewriterTools/StRewriterRuleEditorPresenter.class.st
index ea73a6a08..7e52d8485 100644
--- a/src/NewTools-RewriterTools/StRewriterRuleEditorPresenter.class.st
+++ b/src/NewTools-RewriterTools/StRewriterRuleEditorPresenter.class.st
@@ -12,8 +12,8 @@ If you want to edit an already saved rewrite rule, just click on 'Open Loader' a
 Click on MatchTool to open a tool that allows you to match your rule with a block of Pharo's code.
 "
 Class {
-	#name : #StRewriterRuleEditorPresenter,
-	#superclass : #StPresenter,
+	#name : 'StRewriterRuleEditorPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'cheatSheet',
 		'loadButton',
@@ -26,27 +26,29 @@ Class {
 		'isForMethodCheckbox',
 		'openMatcherButton'
 	],
-	#category : #'NewTools-RewriterTools-RuleEditor'
+	#category : 'NewTools-RewriterTools-RuleEditor',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'RuleEditor'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleEditorPresenter class >> descriptionText [
 
 	^ 'A tool to build and apply custom Rewrite Rules.'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleEditorPresenter class >> icon [
 
 	^ self iconNamed: self iconName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleEditorPresenter class >> iconName [
 	^ #workspaceIcon
 ]
 
-{ #category : #'world menu' }
+{ #category : 'world menu' }
 StRewriterRuleEditorPresenter class >> menuCommandOn: aBuilder [
 
 	<worldMenu>
@@ -58,13 +60,13 @@ StRewriterRuleEditorPresenter class >> menuCommandOn: aBuilder [
 		icon: self icon
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StRewriterRuleEditorPresenter class >> title [
 
 	^ 'Rewrite Basic Editor'
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StRewriterRuleEditorPresenter >> defaultLayout [
 
 	^ SpPanedLayout newLeftToRight
@@ -85,7 +87,7 @@ StRewriterRuleEditorPresenter >> defaultLayout [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRuleEditorPresenter >> initializeButtons [
 
 	loadButton := self instantiate:
@@ -100,14 +102,14 @@ StRewriterRuleEditorPresenter >> initializeButtons [
 		(StRewriterApplyRuleOnSelectedClassesCommand forSpecContext: self) asButtonPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRuleEditorPresenter >> initializeMethodCheckbox [
 
 	isForMethodCheckbox := self newCheckBox.
 	isForMethodCheckbox label: 'The rule is for a method?'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRuleEditorPresenter >> initializePresenters [
 
 	self initializeMethodCheckbox.
@@ -117,26 +119,26 @@ StRewriterRuleEditorPresenter >> initializePresenters [
 	self initializeScopeSelectorPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRuleEditorPresenter >> initializeRuleEditors [
 
 	searchForEditor := self instantiate: StRewriterSearchForPanelPresenter.
 	replaceWithEditor := self instantiate: StRewriterReplaceWithPanelPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRuleEditorPresenter >> initializeScopeSelectorPresenter [
 
 	scopeSelectorPresenter := self instantiate: StRewriterScopeSelectorPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRuleEditorPresenter >> initializeTextCheatSheet [
 
 	cheatSheet := self instantiate: StRewriterCheatSheetPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRuleEditorPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter
@@ -146,33 +148,33 @@ StRewriterRuleEditorPresenter >> initializeWindow: aWindowPresenter [
 		aboutText: self class descriptionText
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleEditorPresenter >> isRuleForMethod [
 
 	^ isForMethodCheckbox state
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleEditorPresenter >> lhs [
 	^ searchForEditor lhs
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleEditorPresenter >> lhs: aCode [
 	searchForEditor lhs: aCode
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleEditorPresenter >> rhs [
 	^ replaceWithEditor rhs
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleEditorPresenter >> rhs: aCode [
 	replaceWithEditor rhs: aCode
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleEditorPresenter >> scopeSelectorPresenter [
 
 	^ scopeSelectorPresenter
diff --git a/src/NewTools-RewriterTools/StRewriterRuleLoaderPresenter.class.st b/src/NewTools-RewriterTools/StRewriterRuleLoaderPresenter.class.st
index da37b1423..5147d8402 100644
--- a/src/NewTools-RewriterTools/StRewriterRuleLoaderPresenter.class.st
+++ b/src/NewTools-RewriterTools/StRewriterRuleLoaderPresenter.class.st
@@ -4,41 +4,43 @@ I am a simple tool that allows you to load or delete any of the custom rewrite r
 To open me: `RewriteRuleLoaderPresenter open`
 "
 Class {
-	#name : #StRewriterRuleLoaderPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StRewriterRuleLoaderPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'openInBasicEditorButton',
 		'matchToolButton',
 		'rulesTableSelector'
 	],
-	#category : #'NewTools-RewriterTools-Loader'
+	#category : 'NewTools-RewriterTools-Loader',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Loader'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleLoaderPresenter class >> descriptionText [
 
 	^ 'Loads and deletes custom rewrite rules'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleLoaderPresenter class >> icon [
 
 	^ self iconNamed: self iconName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleLoaderPresenter class >> iconName [
 
 	^ #smallLoadProject
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StRewriterRuleLoaderPresenter class >> title [
 
 	^ 'Rewrite rule loader'
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StRewriterRuleLoaderPresenter >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
@@ -51,27 +53,27 @@ StRewriterRuleLoaderPresenter >> defaultLayout [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRuleLoaderPresenter >> initializeButtons [
 
 	openInBasicEditorButton := self instantiate: (StRewriterOpenRuleEditorCommand forSpecContext: self) asButtonPresenter.
 	matchToolButton := self instantiate: (StRewriterOpenMatchToolCommand forSpecContext: self) asButtonPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRuleLoaderPresenter >> initializePresenters [
 
 	self initializeTableSelector.
 	self initializeButtons
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRuleLoaderPresenter >> initializeTableSelector [
 
 	rulesTableSelector := self instantiate: StRewriterRulesTableSelectorPresenter
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRuleLoaderPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter
@@ -82,13 +84,13 @@ StRewriterRuleLoaderPresenter >> initializeWindow: aWindowPresenter [
 		aboutText: self class descriptionText
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleLoaderPresenter >> lhs [
 
 	^ rulesTableSelector lhs
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRuleLoaderPresenter >> rhs [
 
 	^ rulesTableSelector rhs
diff --git a/src/NewTools-RewriterTools/StRewriterRulesTableSelectorPresenter.class.st b/src/NewTools-RewriterTools/StRewriterRulesTableSelectorPresenter.class.st
index 4debcd9c7..04d670745 100644
--- a/src/NewTools-RewriterTools/StRewriterRulesTableSelectorPresenter.class.st
+++ b/src/NewTools-RewriterTools/StRewriterRulesTableSelectorPresenter.class.st
@@ -2,16 +2,18 @@
 I am a presenter that provides a table for showing the rules that are stored in the file system. Also, I provide a text input field for filtering the rules according to their name
 "
 Class {
-	#name : #StRewriterRulesTableSelectorPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StRewriterRulesTableSelectorPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'rulesTable',
 		'filterTextInput'
 	],
-	#category : #'NewTools-RewriterTools-Widgets'
+	#category : 'NewTools-RewriterTools-Widgets',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Widgets'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 StRewriterRulesTableSelectorPresenter >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
@@ -20,7 +22,7 @@ StRewriterRulesTableSelectorPresenter >> defaultLayout [
 		  yourself
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StRewriterRulesTableSelectorPresenter >> filterRules: aText [
 
 	| filteredRules |
@@ -34,13 +36,13 @@ StRewriterRulesTableSelectorPresenter >> filterRules: aText [
 	rulesTable items: filteredRules
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterRulesTableSelectorPresenter >> getRules [
 
 	^ StRewriterDemoRules demoRules
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRulesTableSelectorPresenter >> initializeFiltering [
 
 	filterTextInput := self newTextInput.
@@ -49,14 +51,14 @@ StRewriterRulesTableSelectorPresenter >> initializeFiltering [
 		whenTextChangedDo: [ :aText | self filterRules: aText ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRulesTableSelectorPresenter >> initializePresenters [
 
 	self initializeTable.
 	self initializeFiltering
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterRulesTableSelectorPresenter >> initializeTable [
 
 	| lhsTableColumn ruleNameTableColumn hashtagTableColumn rhsTableColumn |
@@ -84,7 +86,7 @@ StRewriterRulesTableSelectorPresenter >> initializeTable [
 		beMultipleSelection
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterRulesTableSelectorPresenter >> lhs [
 
 	^ self selectedRules
@@ -92,7 +94,7 @@ StRewriterRulesTableSelectorPresenter >> lhs [
 		ifNotEmpty: [ :f |self selectedRules first lhs ]
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterRulesTableSelectorPresenter >> rhs [
 
 	^ self selectedRules
@@ -100,7 +102,7 @@ StRewriterRulesTableSelectorPresenter >> rhs [
 		ifNotEmpty: [ :f |self selectedRules first rhs ]
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterRulesTableSelectorPresenter >> selectedRules [
 
 	^ rulesTable selectedItems
diff --git a/src/NewTools-RewriterTools/StRewriterScopeSelectorPresenter.class.st b/src/NewTools-RewriterTools/StRewriterScopeSelectorPresenter.class.st
index 52dc2ae1b..a2e8d8e5f 100644
--- a/src/NewTools-RewriterTools/StRewriterScopeSelectorPresenter.class.st
+++ b/src/NewTools-RewriterTools/StRewriterScopeSelectorPresenter.class.st
@@ -8,64 +8,66 @@ I can be initialized with a collection of packages `MethodsSelectorPresenter cla
 To obtain the selected methods: `MethodsSelectorPresenter>>#selectedMethods`
 "
 Class {
-	#name : #StRewriterScopeSelectorPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StRewriterScopeSelectorPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'methodsSelection',
 		'classesListWithFilterPresenter',
 		'packagesListWithFilterPresenter',
 		'methodsListWithFilterPresenter'
 	],
-	#category : #'NewTools-RewriterTools-Transformer'
+	#category : 'NewTools-RewriterTools-Transformer',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Transformer'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterScopeSelectorPresenter class >> descriptionText [
 
 	^ 'Apply your custom rewrite rules to any packages or classes'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterScopeSelectorPresenter class >> icon [
 	^ self iconNamed: self iconName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterScopeSelectorPresenter class >> iconName [
 	^ #objects
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StRewriterScopeSelectorPresenter class >> title [
 
 	^ 'Select the classes'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterScopeSelectorPresenter class >> windowExtent [
 
 	^ 530 @ 330
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StRewriterScopeSelectorPresenter class >> withPackages: aPackagesCollection [
 
 	^ self new initializeWithPackages: aPackagesCollection
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterScopeSelectorPresenter >> allowMethodSelection [
 
 	methodsSelection := true
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StRewriterScopeSelectorPresenter >> classesChanged [
 
 	self updateSelectionForMethodsPresenter
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StRewriterScopeSelectorPresenter >> defaultLayout [
 
 	^ SpBoxLayout newLeftToRight
@@ -76,13 +78,13 @@ StRewriterScopeSelectorPresenter >> defaultLayout [
 		  yourself
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterScopeSelectorPresenter >> doNotAllowMethodSelection [
 
 	methodsSelection := false
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterScopeSelectorPresenter >> initializeClassesList [
 
 	classesListWithFilterPresenter := self newFilteringList.
@@ -95,7 +97,7 @@ StRewriterScopeSelectorPresenter >> initializeClassesList [
 		beMultipleSelection
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterScopeSelectorPresenter >> initializeMethodsList [
 
 	methodsListWithFilterPresenter := self newFilteringList.
@@ -105,7 +107,7 @@ StRewriterScopeSelectorPresenter >> initializeMethodsList [
 		sortingBlock: [ :a :b | a selector < b selector ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterScopeSelectorPresenter >> initializePackagesList [
 
 	packagesListWithFilterPresenter := self newFilteringList.
@@ -119,7 +121,7 @@ StRewriterScopeSelectorPresenter >> initializePackagesList [
 		beMultipleSelection
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterScopeSelectorPresenter >> initializePresenters [
 
 	self initializePackagesList.
@@ -129,7 +131,7 @@ StRewriterScopeSelectorPresenter >> initializePresenters [
 	self doNotAllowMethodSelection
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterScopeSelectorPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter
@@ -137,13 +139,13 @@ StRewriterScopeSelectorPresenter >> initializeWindow: aWindowPresenter [
 		extent: self class windowExtent
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StRewriterScopeSelectorPresenter >> initializeWithPackages: aPackagesCollection [
 
 	packagesListWithFilterPresenter items: aPackagesCollection
 ]
 
-{ #category : #showing }
+{ #category : 'showing' }
 StRewriterScopeSelectorPresenter >> openDialog [
 
 	| window |
@@ -152,20 +154,20 @@ StRewriterScopeSelectorPresenter >> openDialog [
 	^ window
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StRewriterScopeSelectorPresenter >> packagesChanged [
 
 	self updateSelectionForClassesPresenter.
 	self updateSelectionForMethodsPresenter
 ]
 
-{ #category : #'api - accessing' }
+{ #category : 'api - accessing' }
 StRewriterScopeSelectorPresenter >> selectedClasses [
 
 	^ classesListWithFilterPresenter listPresenter selectedItems
 ]
 
-{ #category : #'api - accessing' }
+{ #category : 'api - accessing' }
 StRewriterScopeSelectorPresenter >> selectedMethods [
 
 	^ methodsListWithFilterPresenter listPresenter selectedItems
@@ -173,7 +175,7 @@ StRewriterScopeSelectorPresenter >> selectedMethods [
 		  ifNotEmpty: [ methodsListWithFilterPresenter listPresenter selectedItems ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StRewriterScopeSelectorPresenter >> updateSelectionForClassesPresenter [
 
 	| selectedClasses |
@@ -184,7 +186,7 @@ StRewriterScopeSelectorPresenter >> updateSelectionForClassesPresenter [
 	classesListWithFilterPresenter listPresenter selectItems: selectedClasses asOrderedCollection
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StRewriterScopeSelectorPresenter >> updateSelectionForMethodsPresenter [
 
 	| methodsInTheSelectedClasses |
diff --git a/src/NewTools-RewriterTools/StRewriterSearchForPanelPresenter.class.st b/src/NewTools-RewriterTools/StRewriterSearchForPanelPresenter.class.st
index b4ed19c41..2d2ace456 100644
--- a/src/NewTools-RewriterTools/StRewriterSearchForPanelPresenter.class.st
+++ b/src/NewTools-RewriterTools/StRewriterSearchForPanelPresenter.class.st
@@ -2,16 +2,18 @@
 I am the panel for the search for (lhs) part of the rule
 "
 Class {
-	#name : #StRewriterSearchForPanelPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StRewriterSearchForPanelPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'label',
 		'codePresenter'
 	],
-	#category : #'NewTools-RewriterTools-Widgets'
+	#category : 'NewTools-RewriterTools-Widgets',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Widgets'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 StRewriterSearchForPanelPresenter >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
@@ -20,7 +22,7 @@ StRewriterSearchForPanelPresenter >> defaultLayout [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StRewriterSearchForPanelPresenter >> initializePresenters [
 
 	label := self newLabel.
@@ -33,13 +35,13 @@ StRewriterSearchForPanelPresenter >> initializePresenters [
 		withoutLineNumbers
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterSearchForPanelPresenter >> lhs [
 
 	^ codePresenter text
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StRewriterSearchForPanelPresenter >> lhs: aString [
 
 	codePresenter text: aString
diff --git a/src/NewTools-RewriterTools/StRewriterToolsStyleContributor.class.st b/src/NewTools-RewriterTools/StRewriterToolsStyleContributor.class.st
index 1b751f706..c446ffbb7 100644
--- a/src/NewTools-RewriterTools/StRewriterToolsStyleContributor.class.st
+++ b/src/NewTools-RewriterTools/StRewriterToolsStyleContributor.class.st
@@ -2,12 +2,14 @@
 Style contributed for RewriterTools
 "
 Class {
-	#name : #StRewriterToolsStyleContributor,
-	#superclass : #StPharoStyleContributor,
-	#category : #'NewTools-RewriterTools-Style'
+	#name : 'StRewriterToolsStyleContributor',
+	#superclass : 'StPharoStyleContributor',
+	#category : 'NewTools-RewriterTools-Style',
+	#package : 'NewTools-RewriterTools',
+	#tag : 'Style'
 }
 
-{ #category : #styles }
+{ #category : 'styles' }
 StRewriterToolsStyleContributor >> styleSheetContribution [
 
 	^  SpStyleVariableSTONReader fromString: '.application [
diff --git a/src/NewTools-RewriterTools/String.extension.st b/src/NewTools-RewriterTools/String.extension.st
index 3a0fda9a6..a837d07c4 100644
--- a/src/NewTools-RewriterTools/String.extension.st
+++ b/src/NewTools-RewriterTools/String.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #String }
+Extension { #name : 'String' }
 
-{ #category : #'*NewTools-RewriterTools' }
+{ #category : '*NewTools-RewriterTools' }
 String >> formattedCode [
 
 	^ self
diff --git a/src/NewTools-RewriterTools/package.st b/src/NewTools-RewriterTools/package.st
index 1e10d919c..80cd13ee4 100644
--- a/src/NewTools-RewriterTools/package.st
+++ b/src/NewTools-RewriterTools/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-RewriterTools' }
+Package { #name : 'NewTools-RewriterTools' }
diff --git a/src/NewTools-SimpleFileBrowser-Core/StSimpleDirectoryWrapper.class.st b/src/NewTools-SimpleFileBrowser-Core/StSimpleDirectoryWrapper.class.st
index 2c1727962..fd8a148ac 100644
--- a/src/NewTools-SimpleFileBrowser-Core/StSimpleDirectoryWrapper.class.st
+++ b/src/NewTools-SimpleFileBrowser-Core/StSimpleDirectoryWrapper.class.st
@@ -2,12 +2,13 @@
 A wrapper for a regular directory
 "
 Class {
-	#name : #StSimpleDirectoryWrapper,
-	#superclass : #StSimpleFileSystemItemWrapper,
-	#category : #'NewTools-SimpleFileBrowser-Core'
+	#name : 'StSimpleDirectoryWrapper',
+	#superclass : 'StSimpleFileSystemItemWrapper',
+	#category : 'NewTools-SimpleFileBrowser-Core',
+	#package : 'NewTools-SimpleFileBrowser-Core'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSimpleDirectoryWrapper >> isDirectory [
 
 	^true
diff --git a/src/NewTools-SimpleFileBrowser-Core/StSimpleFileSystemItemWrapper.class.st b/src/NewTools-SimpleFileBrowser-Core/StSimpleFileSystemItemWrapper.class.st
index 9879a72b0..17fc1131b 100644
--- a/src/NewTools-SimpleFileBrowser-Core/StSimpleFileSystemItemWrapper.class.st
+++ b/src/NewTools-SimpleFileBrowser-Core/StSimpleFileSystemItemWrapper.class.st
@@ -2,32 +2,33 @@
 Abstract superclass to wrap items found in file system
 "
 Class {
-	#name : #StSimpleFileSystemItemWrapper,
-	#superclass : #Object,
+	#name : 'StSimpleFileSystemItemWrapper',
+	#superclass : 'Object',
 	#instVars : [
 		'fileReference'
 	],
-	#category : #'NewTools-SimpleFileBrowser-Core'
+	#category : 'NewTools-SimpleFileBrowser-Core',
+	#package : 'NewTools-SimpleFileBrowser-Core'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileSystemItemWrapper class >> icon [ 
 	^self iconProvider folderIcon 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileSystemItemWrapper class >> iconProvider [ 
 
 	^StSimpleIconCache 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSimpleFileSystemItemWrapper class >> isAbstract [ 
 
 	^self name = #StSimpleFileSystemItemWrapper
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSimpleFileSystemItemWrapper class >> on: aFileReference [
 
 	^(self new)
@@ -35,7 +36,7 @@ StSimpleFileSystemItemWrapper class >> on: aFileReference [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileSystemItemWrapper class >> roots [
 
 	^ Smalltalk os isWindows
@@ -43,20 +44,20 @@ StSimpleFileSystemItemWrapper class >> roots [
 		ifFalse: [ Array with: (StSimpleRootDirectoryWrapper on: FileSystem root) ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileSystemItemWrapper class >> systemIcon [
 
 	^self isAbstract ifTrue: [ super systemIcon ] ifFalse: [ self icon ]
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StSimpleFileSystemItemWrapper >> = other [
 
 	^ self species = other species 
 		and: [ self fileReference = other fileReference ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileSystemItemWrapper >> allElements [  
 	
 	^(OrderedCollection withAll: self subdirectories) 
@@ -64,34 +65,34 @@ StSimpleFileSystemItemWrapper >> allElements [
 		yourself
 ]
 
-{ #category : #conversion }
+{ #category : 'conversion' }
 StSimpleFileSystemItemWrapper >> asFileReference [ 
 
 	^self fileReference
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSimpleFileSystemItemWrapper >> browseFolder [
 	fileReference openInOSFileBrowser 
 ]
 
-{ #category : #'private - accessing' }
+{ #category : 'private - accessing' }
 StSimpleFileSystemItemWrapper >> directories [ 
 	[ self fileReference directories ] on: Exception do: [ ^#()].
 	^self fileReference directories
 ]
 
-{ #category : #'private - accessing' }
+{ #category : 'private - accessing' }
 StSimpleFileSystemItemWrapper >> fileReference [
 	^ fileReference
 ]
 
-{ #category : #'private - accessing' }
+{ #category : 'private - accessing' }
 StSimpleFileSystemItemWrapper >> fileReference: anObject [
 	fileReference := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileSystemItemWrapper >> files [ 
 	
 	^[fileReference files collect: [:each | StSimpleFileWrapper on: each ] ]
@@ -99,42 +100,42 @@ StSimpleFileSystemItemWrapper >> files [
 		do: [ #() ]
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StSimpleFileSystemItemWrapper >> hash [
 
 	^ self species hash 
 		bitXor: self fileReference hash
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileSystemItemWrapper >> icon [
 
 	^self class icon
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSimpleFileSystemItemWrapper >> isDirectory [
 
 	^false
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSimpleFileSystemItemWrapper >> isFile [
 
 	^false
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSimpleFileSystemItemWrapper >> isRoot [ 
 	^false
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileSystemItemWrapper >> label [ 
 	^self fileReference basename
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileSystemItemWrapper >> pathString [
  
 	| path |
@@ -143,12 +144,12 @@ StSimpleFileSystemItemWrapper >> pathString [
 		ifFalse: [ path ]
 ]
 
-{ #category : #'private - accessing' }
+{ #category : 'private - accessing' }
 StSimpleFileSystemItemWrapper >> size [ 
 	^''
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileSystemItemWrapper >> subdirectories [ 
 	
 	^self directories collect: [:each | StSimpleDirectoryWrapper on: each ] 
diff --git a/src/NewTools-SimpleFileBrowser-Core/StSimpleFileUtils.class.st b/src/NewTools-SimpleFileBrowser-Core/StSimpleFileUtils.class.st
index 2bf417f5d..3882d4b6e 100644
--- a/src/NewTools-SimpleFileBrowser-Core/StSimpleFileUtils.class.st
+++ b/src/NewTools-SimpleFileBrowser-Core/StSimpleFileUtils.class.st
@@ -2,30 +2,31 @@
 File utilities
 "
 Class {
-	#name : #StSimpleFileUtils,
-	#superclass : #Object,
+	#name : 'StSimpleFileUtils',
+	#superclass : 'Object',
 	#classVars : [
 		'IconCache'
 	],
-	#category : #'NewTools-SimpleFileBrowser-Core'
+	#category : 'NewTools-SimpleFileBrowser-Core',
+	#package : 'NewTools-SimpleFileBrowser-Core'
 }
 
-{ #category : #'private - testing' }
+{ #category : 'private - testing' }
 StSimpleFileUtils class >> isLinux [
 	^Smalltalk os version beginsWith: 'linux'
 ]
 
-{ #category : #'private - testing' }
+{ #category : 'private - testing' }
 StSimpleFileUtils class >> isMac [ 
 	^Smalltalk os isMacOS
 ]
 
-{ #category : #'private - testing' }
+{ #category : 'private - testing' }
 StSimpleFileUtils class >> isWindows [ 
 	^Smalltalk os isWindows
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSimpleFileUtils class >> openLinuxTerminalOn: aPath [
 
 	(Delay forMilliseconds: 1000) wait.  	
@@ -34,7 +35,7 @@ StSimpleFileUtils class >> openLinuxTerminalOn: aPath [
  
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSimpleFileUtils class >> openMacTerminalOn: aPath [
 
 	| escaped |
@@ -42,7 +43,7 @@ StSimpleFileUtils class >> openMacTerminalOn: aPath [
 	LibC system: 'open -a Terminal ', escaped
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSimpleFileUtils class >> openTerminalOn: aPath [
 
 	self isWindows 
@@ -56,13 +57,13 @@ StSimpleFileUtils class >> openTerminalOn: aPath [
 
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSimpleFileUtils class >> openWindowsTerminalOn: aPath [
 
 	^LibC system: 'start cmd.exe /K "cd /d ', aPath, '"'
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSimpleFileUtils class >> representsShortWindowsDrive: aString [
 	"Solve later with a regexp
 	
diff --git a/src/NewTools-SimpleFileBrowser-Core/StSimpleFileWrapper.class.st b/src/NewTools-SimpleFileBrowser-Core/StSimpleFileWrapper.class.st
index 1aa9a10da..5f9d35df2 100644
--- a/src/NewTools-SimpleFileBrowser-Core/StSimpleFileWrapper.class.st
+++ b/src/NewTools-SimpleFileBrowser-Core/StSimpleFileWrapper.class.st
@@ -2,23 +2,24 @@
 A file wrapper
 "
 Class {
-	#name : #StSimpleFileWrapper,
-	#superclass : #StSimpleFileSystemItemWrapper,
-	#category : #'NewTools-SimpleFileBrowser-Core'
+	#name : 'StSimpleFileWrapper',
+	#superclass : 'StSimpleFileSystemItemWrapper',
+	#category : 'NewTools-SimpleFileBrowser-Core',
+	#package : 'NewTools-SimpleFileBrowser-Core'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileWrapper class >> icon [ 
 	^self iconProvider fileIcon 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSimpleFileWrapper >> isFile [
 
 	^true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileWrapper >> size [
 	"See https://github.com/pharo-project/pharo/issues/3571"
 	
diff --git a/src/NewTools-SimpleFileBrowser-Core/StSimpleIconCache.class.st b/src/NewTools-SimpleFileBrowser-Core/StSimpleIconCache.class.st
index bfd1523f0..d1b8f97e8 100644
--- a/src/NewTools-SimpleFileBrowser-Core/StSimpleIconCache.class.st
+++ b/src/NewTools-SimpleFileBrowser-Core/StSimpleIconCache.class.st
@@ -2,22 +2,23 @@
 An icon cache
 "
 Class {
-	#name : #StSimpleIconCache,
-	#superclass : #Object,
+	#name : 'StSimpleIconCache',
+	#superclass : 'Object',
 	#classVars : [
 		'IconCache'
 	],
-	#category : #'NewTools-SimpleFileBrowser-Core'
+	#category : 'NewTools-SimpleFileBrowser-Core',
+	#package : 'NewTools-SimpleFileBrowser-Core'
 }
 
-{ #category : #icons }
+{ #category : 'icons' }
 StSimpleIconCache class >> driveIcon [
 	<script: 'self driveIcon inspect'>
 
 	^self iconNamed: #driveIcon
 ]
 
-{ #category : #'private - icons' }
+{ #category : 'private - icons' }
 StSimpleIconCache class >> driveIconContents [
 
 	^'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA/0lEQVQ4je2RPUoDcRDFf7tI
@@ -28,14 +29,14 @@ DucceZ4Tr8VUTitIorO3H8zf4Af4LZ/wICQO43m97AC7MHq7Papn1TndA7h/fh9GTw9B8TZZ
 kd007kzugEASi/XGaH2lWStr4Ft8AlWZooQwDP14AAAAAElFTkSuQmCC'
 ]
 
-{ #category : #icons }
+{ #category : 'icons' }
 StSimpleIconCache class >> fileIcon [
 	<script: 'self fileIcon inspect'>
 
 	^self iconNamed: #fileIcon
 ]
 
-{ #category : #'private - icons' }
+{ #category : 'private - icons' }
 StSimpleIconCache class >> fileIconContents [
 
 	^'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACjElEQVR42o2SW0hUURSG/32O
@@ -54,14 +55,14 @@ Mk89yCyvFwfvBy1SbF6VLWF7TIRPUdV/FRNNh6qowsDHyaG5l9d2fwfyXD4gAGnljAAAAABJ
 RU5ErkJggg=='
 ]
 
-{ #category : #icons }
+{ #category : 'icons' }
 StSimpleIconCache class >> folderIcon [
 	<script: 'self folderIcon inspect'>
 
 	^self iconNamed: #folderIcon
 ]
 
-{ #category : #'private - icons' }
+{ #category : 'private - icons' }
 StSimpleIconCache class >> folderIconContents [
 
 	^'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABdElEQVR42mNkoBAwwhhdbT7Z
@@ -74,13 +75,13 @@ cdrkgprMGI1m0myHxEJ4fcNkxikTc2qyY3TJ8AIDQ1h97WRGaysdM011qeh///8w/v8HSmV/
 GP7/+8sA5DOg8EH0fxD/L1z87OW3W+GZieLcSC4AAOV6G9lUA/2gAAAAAElFTkSuQmCC'
 ]
 
-{ #category : #'private - accessing' }
+{ #category : 'private - accessing' }
 StSimpleIconCache class >> iconCache [
 
 	^ IconCache ifNil: [ IconCache := Dictionary new ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleIconCache class >> iconNamed: aSymbol [
 	"Returns the icon with the given name"
 	
@@ -94,7 +95,7 @@ StSimpleIconCache class >> iconNamed: aSymbol [
 				fromBinaryStream: (self perform: selector) base64Decoded readStream ]
 ]
 
-{ #category : #'initialization-release' }
+{ #category : 'initialization-release' }
 StSimpleIconCache class >> reset [
 	"Reset the icon cache"	
 	<script>
@@ -102,14 +103,14 @@ StSimpleIconCache class >> reset [
 	IconCache := nil
 ]
 
-{ #category : #icons }
+{ #category : 'icons' }
 StSimpleIconCache class >> terminalIcon [
 	<script: 'self terminalIcon inspect'>
 
 	^self iconNamed: #terminalIcon
 ]
 
-{ #category : #'private - icons' }
+{ #category : 'private - icons' }
 StSimpleIconCache class >> terminalIconContents [
 
 	^'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHklEQVR4XmOgGIiKimlo6+iF
diff --git a/src/NewTools-SimpleFileBrowser-Core/StSimpleRootDirectoryWrapper.class.st b/src/NewTools-SimpleFileBrowser-Core/StSimpleRootDirectoryWrapper.class.st
index ae53e75a0..1886ac5a6 100644
--- a/src/NewTools-SimpleFileBrowser-Core/StSimpleRootDirectoryWrapper.class.st
+++ b/src/NewTools-SimpleFileBrowser-Core/StSimpleRootDirectoryWrapper.class.st
@@ -2,12 +2,13 @@
 A root directory as found on Unix or Mac (/)
 "
 Class {
-	#name : #StSimpleRootDirectoryWrapper,
-	#superclass : #StSimpleDirectoryWrapper,
-	#category : #'NewTools-SimpleFileBrowser-Core'
+	#name : 'StSimpleRootDirectoryWrapper',
+	#superclass : 'StSimpleDirectoryWrapper',
+	#category : 'NewTools-SimpleFileBrowser-Core',
+	#package : 'NewTools-SimpleFileBrowser-Core'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSimpleRootDirectoryWrapper >> isRoot [ 
 	^true
 ]
diff --git a/src/NewTools-SimpleFileBrowser-Core/StSimpleRootDriveWrapper.class.st b/src/NewTools-SimpleFileBrowser-Core/StSimpleRootDriveWrapper.class.st
index 836f5fde5..2675ced57 100644
--- a/src/NewTools-SimpleFileBrowser-Core/StSimpleRootDriveWrapper.class.st
+++ b/src/NewTools-SimpleFileBrowser-Core/StSimpleRootDriveWrapper.class.st
@@ -2,33 +2,34 @@
 A root drive as found on Windows
 "
 Class {
-	#name : #StSimpleRootDriveWrapper,
-	#superclass : #StSimpleFileSystemItemWrapper,
-	#category : #'NewTools-SimpleFileBrowser-Core'
+	#name : 'StSimpleRootDriveWrapper',
+	#superclass : 'StSimpleFileSystemItemWrapper',
+	#category : 'NewTools-SimpleFileBrowser-Core',
+	#package : 'NewTools-SimpleFileBrowser-Core'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleRootDriveWrapper class >> icon [ 
 	^self iconProvider driveIcon
 ]
 
-{ #category : #'private accessing' }
+{ #category : 'private accessing' }
 StSimpleRootDriveWrapper >> directories [ 
 	^(fileReference basename, '\') asFileReference directories
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSimpleRootDriveWrapper >> isRoot [ 
 	^true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleRootDriveWrapper >> label [
 
 	^self volumeName, ' (' ,super label, ')'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleRootDriveWrapper >> volumeName [
 
 	^StSimpleWin32Info getVolumeInfo: self fileReference basename
diff --git a/src/NewTools-SimpleFileBrowser-Core/StSimpleWin32Info.class.st b/src/NewTools-SimpleFileBrowser-Core/StSimpleWin32Info.class.st
index 1a43ed35e..ae5b4d2cf 100644
--- a/src/NewTools-SimpleFileBrowser-Core/StSimpleWin32Info.class.st
+++ b/src/NewTools-SimpleFileBrowser-Core/StSimpleWin32Info.class.st
@@ -2,21 +2,22 @@
 Utility to access Win32 functions
 "
 Class {
-	#name : #StSimpleWin32Info,
-	#superclass : #Object,
+	#name : 'StSimpleWin32Info',
+	#superclass : 'Object',
 	#classVars : [
 		'IconCache'
 	],
-	#category : #'NewTools-SimpleFileBrowser-Core'
+	#category : 'NewTools-SimpleFileBrowser-Core',
+	#package : 'NewTools-SimpleFileBrowser-Core'
 }
 
-{ #category : #examples }
+{ #category : 'examples' }
 StSimpleWin32Info class >> example [
 
 	(self getVolumeInfo: 'C:') inspect
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleWin32Info class >> getVolumeInfo: driveLetter [
 
 	| buffer driveName |
@@ -27,7 +28,7 @@ StSimpleWin32Info class >> getVolumeInfo: driveLetter [
 	 
 ]
 
-{ #category : #'private-ffi' }
+{ #category : 'private-ffi' }
 StSimpleWin32Info class >> getVolumeInfo: volumeName into: lpBuffer size: nSize [
 	"Primitive to obtain an environment variable using windows Wide Strings"
 	^ self ffiCall: #(uint GetVolumeInformationW (Win32WideString volumeName, Win32WideString lpBuffer, ulong nSize, nil, nil, nil, nil, 0)) module: #kernel32
diff --git a/src/NewTools-SimpleFileBrowser-Core/package.st b/src/NewTools-SimpleFileBrowser-Core/package.st
index d1d27ee55..4772a29c9 100644
--- a/src/NewTools-SimpleFileBrowser-Core/package.st
+++ b/src/NewTools-SimpleFileBrowser-Core/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-SimpleFileBrowser-Core' }
+Package { #name : 'NewTools-SimpleFileBrowser-Core' }
diff --git a/src/NewTools-SimpleFileBrowser-UI/StSimpleFileBrowserPresenter.class.st b/src/NewTools-SimpleFileBrowser-UI/StSimpleFileBrowserPresenter.class.st
index 87ca8da5b..1c58b9821 100644
--- a/src/NewTools-SimpleFileBrowser-UI/StSimpleFileBrowserPresenter.class.st
+++ b/src/NewTools-SimpleFileBrowser-UI/StSimpleFileBrowserPresenter.class.st
@@ -9,8 +9,8 @@ A simple file browser experiment for Pharo written by T. Bergmann (Astares) in 2
 Clases got renamed to avoid name clashes. 
 "
 Class {
-	#name : #StSimpleFileBrowserPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StSimpleFileBrowserPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'menu',
 		'statusBar',
@@ -19,10 +19,12 @@ Class {
 		'folderContentPresenter',
 		'folderStructurePresenter'
 	],
-	#category : #'NewTools-SimpleFileBrowser-UI-Windows'
+	#category : 'NewTools-SimpleFileBrowser-UI-Windows',
+	#package : 'NewTools-SimpleFileBrowser-UI',
+	#tag : 'Windows'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSimpleFileBrowserPresenter class >> defaultSpec [
 
 	^ SpBoxLayout newTopToBottom 		 
@@ -35,12 +37,12 @@ StSimpleFileBrowserPresenter class >> defaultSpec [
 		yourself		
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileBrowserPresenter class >> icon [ 
 	^StSimpleIconCache driveIcon
 ]
 
-{ #category : #'world menu' }
+{ #category : 'world menu' }
 StSimpleFileBrowserPresenter class >> menuCommandOn: aBuilder [ 
 	<worldMenu> 
 	(aBuilder item: #'File Manager')
@@ -52,24 +54,24 @@ StSimpleFileBrowserPresenter class >> menuCommandOn: aBuilder [
 	
 ]
 
-{ #category : #showing }
+{ #category : 'showing' }
 StSimpleFileBrowserPresenter class >> open [
 	<script>
 
 	self new openWithSpec
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileBrowserPresenter class >> systemIcon [ 
 	^self icon
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileBrowserPresenter class >> taskbarIcon [ 
 	^self icon
 ]
 
-{ #category : #'private - building' }
+{ #category : 'private - building' }
 StSimpleFileBrowserPresenter >> buildExtrasMenu [
 
 	^ self newMenu
@@ -77,7 +79,7 @@ StSimpleFileBrowserPresenter >> buildExtrasMenu [
 		yourself
 ]
 
-{ #category : #'private - building' }
+{ #category : 'private - building' }
 StSimpleFileBrowserPresenter >> buildFileMenu [
 
 	^ self newMenu
@@ -85,7 +87,7 @@ StSimpleFileBrowserPresenter >> buildFileMenu [
 		yourself
 ]
 
-{ #category : #'private - building' }
+{ #category : 'private - building' }
 StSimpleFileBrowserPresenter >> buildMenuBar [
 	^ self newMenuBar
 		addGroup: [ :group | 
@@ -99,7 +101,7 @@ StSimpleFileBrowserPresenter >> buildMenuBar [
 						subMenu: self buildExtrasMenu ] ]
 ]
 
-{ #category : #'private - building' }
+{ #category : 'private - building' }
 StSimpleFileBrowserPresenter >> buildNavigateBackToolBarItem [
 		
 	^ SpToolbarButtonPresenter new
@@ -110,7 +112,7 @@ StSimpleFileBrowserPresenter >> buildNavigateBackToolBarItem [
 		yourself
 ]
 
-{ #category : #'private - building' }
+{ #category : 'private - building' }
 StSimpleFileBrowserPresenter >> buildNavigateForwardToolBarItem [
 		
 	^ SpToolbarButtonPresenter new
@@ -121,7 +123,7 @@ StSimpleFileBrowserPresenter >> buildNavigateForwardToolBarItem [
 		yourself
 ]
 
-{ #category : #'private - building' }
+{ #category : 'private - building' }
 StSimpleFileBrowserPresenter >> buildOpenNativeFileBrowserToolBarItem [
 		
 	^ SpToolbarButtonPresenter new
@@ -132,7 +134,7 @@ StSimpleFileBrowserPresenter >> buildOpenNativeFileBrowserToolBarItem [
 		yourself
 ]
 
-{ #category : #'private - building' }
+{ #category : 'private - building' }
 StSimpleFileBrowserPresenter >> buildOpenTerminalToolBarItem [
 		
 	^ SpToolbarButtonPresenter new
@@ -143,13 +145,13 @@ StSimpleFileBrowserPresenter >> buildOpenTerminalToolBarItem [
 		yourself
 ]
 
-{ #category : #'private - building' }
+{ #category : 'private - building' }
 StSimpleFileBrowserPresenter >> buildStatusBar [
 
 	^ SpStatusBarPresenter new
 ]
 
-{ #category : #'private - building' }
+{ #category : 'private - building' }
 StSimpleFileBrowserPresenter >> buildToolBar [
 	
 	^ self newToolbar 
@@ -160,12 +162,12 @@ StSimpleFileBrowserPresenter >> buildToolBar [
 		yourself
 ]
 
-{ #category : #defaults }
+{ #category : 'defaults' }
 StSimpleFileBrowserPresenter >> initialExtent [ 
 	^ 700 @ 500
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimpleFileBrowserPresenter >> initializePresenters [
 
 	pathNamePresenter := self instantiate: StSimplePathNamePresenter.
@@ -180,7 +182,7 @@ StSimpleFileBrowserPresenter >> initializePresenters [
 		self statusBar pushMessage: (self statusTextFor: items) ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimpleFileBrowserPresenter >> initializeWindow: aWindowPresenter [
 	"I'm called whenever the component will be displayed in a window (or dialog). 
 	 This is usually attained sending #openWithSpec or #openDialogWithSpec."
@@ -195,70 +197,70 @@ StSimpleFileBrowserPresenter >> initializeWindow: aWindowPresenter [
 	self statusBar pushMessage: 'Ready'	
 ]
 
-{ #category : #'private - accessing' }
+{ #category : 'private - accessing' }
 StSimpleFileBrowserPresenter >> lastPath [
 
 	^ FileLocator home
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StSimpleFileBrowserPresenter >> menu [
 	^ menu
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StSimpleFileBrowserPresenter >> menu: anObject [
 	^ menu := anObject
 ]
 
-{ #category : #showing }
+{ #category : 'showing' }
 StSimpleFileBrowserPresenter >> open [ 
 	<script: 'self open'>
 	self class open
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSimpleFileBrowserPresenter >> openNativeFileBrowser [
 
 	pathNamePresenter openNativeFileBrowser
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSimpleFileBrowserPresenter >> openTerminal [
 
 	StSimpleFileUtils openTerminalOn: pathNamePresenter pathName
 	
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSimpleFileBrowserPresenter >> pushMessage [
 	
 	statusBar pushMessage: 'HelloWorld'
 ]
 
-{ #category : #'private - accessing' }
+{ #category : 'private - accessing' }
 StSimpleFileBrowserPresenter >> selectLastPath [
 
 	self selectPath: self lastPath fullPath withParents
 ]
 
-{ #category : #'private - accessing' }
+{ #category : 'private - accessing' }
 StSimpleFileBrowserPresenter >> selectPath: path [
 
 	folderStructurePresenter selectPathByItems: path
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StSimpleFileBrowserPresenter >> statusBar [
 	^ statusBar
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StSimpleFileBrowserPresenter >> statusBar: anObject [
 	^ statusBar := anObject
 ]
 
-{ #category : #'private - accessing' }
+{ #category : 'private - accessing' }
 StSimpleFileBrowserPresenter >> statusTextFor: aCollection [ 
 	 
 	| onlyFiles text |
@@ -272,23 +274,23 @@ StSimpleFileBrowserPresenter >> statusTextFor: aCollection [
 	^text
 ]
 
-{ #category : #defaults }
+{ #category : 'defaults' }
 StSimpleFileBrowserPresenter >> title [ 
 
    ^'File browser'
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StSimpleFileBrowserPresenter >> toolBar [
 	^ toolBar
 ]
 
-{ #category : #'accessing - ui' }
+{ #category : 'accessing - ui' }
 StSimpleFileBrowserPresenter >> toolBar: anObject [
 	^ toolBar := anObject
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimpleFileBrowserPresenter >> updatePresenter [
 
 ]
diff --git a/src/NewTools-SimpleFileBrowser-UI/StSimpleFileDetailPresenter.class.st b/src/NewTools-SimpleFileBrowser-UI/StSimpleFileDetailPresenter.class.st
index 61e174316..f1bfc149a 100644
--- a/src/NewTools-SimpleFileBrowser-UI/StSimpleFileDetailPresenter.class.st
+++ b/src/NewTools-SimpleFileBrowser-UI/StSimpleFileDetailPresenter.class.st
@@ -2,17 +2,19 @@
 Present file details
 "
 Class {
-	#name : #StSimpleFileDetailPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StSimpleFileDetailPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'notebook',
 		'selectedFile',
 		'page'
 	],
-	#category : #'NewTools-SimpleFileBrowser-UI-Components'
+	#category : 'NewTools-SimpleFileBrowser-UI-Components',
+	#package : 'NewTools-SimpleFileBrowser-UI',
+	#tag : 'Components'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSimpleFileDetailPresenter class >> defaultSpec [
 
 	^ SpBoxLayout newLeftToRight	 
@@ -20,14 +22,14 @@ StSimpleFileDetailPresenter class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSimpleFileDetailPresenter class >> open [ 
 	<script>
 	(self new)
 		openWithSpec 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimpleFileDetailPresenter >> detailText [
 
 	^self newText
@@ -35,14 +37,14 @@ StSimpleFileDetailPresenter >> detailText [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimpleFileDetailPresenter >> fileContents [ 
 
 	^ selectedFile asFileReference binaryReadStreamDo: [ :stream |
 		(ZnCharacterReadStream on: stream encoding: #null) next: 5000 ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimpleFileDetailPresenter >> fileContentsPage [
 
 	^ SpNotebookPage
@@ -52,7 +54,7 @@ StSimpleFileDetailPresenter >> fileContentsPage [
 		 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileDetailPresenter >> hidePage [
 
 	page ifNotNil: [ 
@@ -60,26 +62,26 @@ StSimpleFileDetailPresenter >> hidePage [
 			page := nil ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimpleFileDetailPresenter >> initializePresenters [
 	
 	notebook := self newNotebook
 	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileDetailPresenter >> selectedFile [
 
 	^ selectedFile
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileDetailPresenter >> selectedFile: anObject [
 
 	selectedFile := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFileDetailPresenter >> showFile: anObject [
 
 	self hidePage.
diff --git a/src/NewTools-SimpleFileBrowser-UI/StSimpleFolderContentPresenter.class.st b/src/NewTools-SimpleFileBrowser-UI/StSimpleFolderContentPresenter.class.st
index 99b1022cf..c2954bd1d 100644
--- a/src/NewTools-SimpleFileBrowser-UI/StSimpleFolderContentPresenter.class.st
+++ b/src/NewTools-SimpleFileBrowser-UI/StSimpleFolderContentPresenter.class.st
@@ -2,17 +2,19 @@
 Show the content of a folder as list
 "
 Class {
-	#name : #StSimpleFolderContentPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StSimpleFolderContentPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'table',
 		'folder',
 		'detail'
 	],
-	#category : #'NewTools-SimpleFileBrowser-UI-Components'
+	#category : 'NewTools-SimpleFileBrowser-UI-Components',
+	#package : 'NewTools-SimpleFileBrowser-UI',
+	#tag : 'Components'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSimpleFolderContentPresenter class >> defaultSpec [
 
 	^ SpPanedLayout newTopToBottom
@@ -22,13 +24,13 @@ StSimpleFolderContentPresenter class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #examples }
+{ #category : 'examples' }
 StSimpleFolderContentPresenter class >> example [
 
 	^self openOn: FileSystem workingDirectory
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSimpleFolderContentPresenter class >> on: aFileReference [
 
 	^(self new)
@@ -36,24 +38,24 @@ StSimpleFolderContentPresenter class >> on: aFileReference [
 		yourself
 ]
 
-{ #category : #show }
+{ #category : 'show' }
 StSimpleFolderContentPresenter class >> openOn: aFileReference [
 
 	(self on: aFileReference) openWithSpec
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFolderContentPresenter >> detail [
 
 	^detail ifNil: [ detail := (self instantiate: StSimpleFileDetailPresenter) ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFolderContentPresenter >> folder [
 	^ folder
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFolderContentPresenter >> folder: anObject [
 	folder := anObject.
 	detail showFile: nil.
@@ -61,7 +63,7 @@ StSimpleFolderContentPresenter >> folder: anObject [
 	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimpleFolderContentPresenter >> initializePresenters [
 
 	self detail.
@@ -84,13 +86,13 @@ StSimpleFolderContentPresenter >> initializePresenters [
 			evaluated: [ :each | each size ])
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFolderContentPresenter >> table [
 
 	^table ifNil: [ table := self newTable ]
 ]
 
-{ #category : #'api-events' }
+{ #category : 'api-events' }
 StSimpleFolderContentPresenter >> whenItemsChangedDo: aBlock [
 	
 	table whenSelectionChangedDo: [ :selection | 
diff --git a/src/NewTools-SimpleFileBrowser-UI/StSimpleFolderStructurePresenter.class.st b/src/NewTools-SimpleFileBrowser-UI/StSimpleFolderStructurePresenter.class.st
index 6a86d742a..8aaa9a2e0 100644
--- a/src/NewTools-SimpleFileBrowser-UI/StSimpleFolderStructurePresenter.class.st
+++ b/src/NewTools-SimpleFileBrowser-UI/StSimpleFolderStructurePresenter.class.st
@@ -2,15 +2,17 @@
 Presenter for a folder structure
 "
 Class {
-	#name : #StSimpleFolderStructurePresenter,
-	#superclass : #SpPresenter,
+	#name : 'StSimpleFolderStructurePresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'tree'
 	],
-	#category : #'NewTools-SimpleFileBrowser-UI-Components'
+	#category : 'NewTools-SimpleFileBrowser-UI-Components',
+	#package : 'NewTools-SimpleFileBrowser-UI',
+	#tag : 'Components'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSimpleFolderStructurePresenter class >> defaultSpec [
 
 	^ SpBoxLayout newTopToBottom
@@ -18,18 +20,18 @@ StSimpleFolderStructurePresenter class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSimpleFolderStructurePresenter class >> open [ 
 	<script>
 	self new openWithSpec 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSimpleFolderStructurePresenter >> browseFolder [
 	 tree selectedItem browseFolder 
 ]
 
-{ #category : #'menu handling' }
+{ #category : 'menu handling' }
 StSimpleFolderStructurePresenter >> folderContextMenu [
 
 	^(SpMenuPresenter new
@@ -38,7 +40,7 @@ StSimpleFolderStructurePresenter >> folderContextMenu [
 		])
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimpleFolderStructurePresenter >> initializePresenters [
 
 	tree := self newTreeTable.
@@ -62,7 +64,7 @@ StSimpleFolderStructurePresenter >> initializePresenters [
 	tree contextMenu: self folderContextMenu
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFolderStructurePresenter >> pathIndexOf: pathArray in: aCollection [ 
 	| pathElement |
 	
@@ -73,13 +75,13 @@ StSimpleFolderStructurePresenter >> pathIndexOf: pathArray in: aCollection [
 		in: (tree childrenFor: (aCollection at: pathElement)))
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSimpleFolderStructurePresenter >> selectPathByItems: path [ 
 
 	tree selectPath: (self pathIndexOf: path in: tree roots)
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimpleFolderStructurePresenter >> title [
 
 	^ Smalltalk os isWindows 
@@ -88,7 +90,7 @@ StSimpleFolderStructurePresenter >> title [
 	
 ]
 
-{ #category : #'api-events' }
+{ #category : 'api-events' }
 StSimpleFolderStructurePresenter >> whenFolderChangedDo: aBlock [
 	
 	tree whenSelectionChangedDo: [ :selection | 
diff --git a/src/NewTools-SimpleFileBrowser-UI/StSimplePathNamePresenter.class.st b/src/NewTools-SimpleFileBrowser-UI/StSimplePathNamePresenter.class.st
index e18619ac0..5a79fefca 100644
--- a/src/NewTools-SimpleFileBrowser-UI/StSimplePathNamePresenter.class.st
+++ b/src/NewTools-SimpleFileBrowser-UI/StSimplePathNamePresenter.class.st
@@ -2,18 +2,20 @@
 Presenter for path name
 "
 Class {
-	#name : #StSimplePathNamePresenter,
-	#superclass : #SpPresenter,
+	#name : 'StSimplePathNamePresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'tree',
 		'text',
 		'label',
 		'button'
 	],
-	#category : #'NewTools-SimpleFileBrowser-UI-Components'
+	#category : 'NewTools-SimpleFileBrowser-UI-Components',
+	#package : 'NewTools-SimpleFileBrowser-UI',
+	#tag : 'Components'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSimplePathNamePresenter class >> defaultSpec [ 
 	^ SpBoxLayout newLeftToRight 	
 		add: #label expand: false;
@@ -21,14 +23,14 @@ StSimplePathNamePresenter class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimplePathNamePresenter >> initializePresenters [
 
 	label := self newLabel label: 'Path:'.
 	text := self newTextInput 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSimplePathNamePresenter >> openNativeFileBrowser [
 	| path |
 	
@@ -39,13 +41,13 @@ StSimplePathNamePresenter >> openNativeFileBrowser [
 	path asFileReference openInOSFileBrowser
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimplePathNamePresenter >> pathName [
 
 	^ text text
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSimplePathNamePresenter >> pathName: aString [
 
 	text text: aString
diff --git a/src/NewTools-SimpleFileBrowser-UI/package.st b/src/NewTools-SimpleFileBrowser-UI/package.st
index 38f2a2302..8427ed822 100644
--- a/src/NewTools-SimpleFileBrowser-UI/package.st
+++ b/src/NewTools-SimpleFileBrowser-UI/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-SimpleFileBrowser-UI' }
+Package { #name : 'NewTools-SimpleFileBrowser-UI' }
diff --git a/src/NewTools-Sindarin-Commands-Tests/SindarinCommandsTest.class.st b/src/NewTools-Sindarin-Commands-Tests/SindarinCommandsTest.class.st
index a7a455de5..ee572c7e6 100644
--- a/src/NewTools-Sindarin-Commands-Tests/SindarinCommandsTest.class.st
+++ b/src/NewTools-Sindarin-Commands-Tests/SindarinCommandsTest.class.st
@@ -1,15 +1,16 @@
 Class {
-	#name : #SindarinCommandsTest,
-	#superclass : #TestCase,
+	#name : 'SindarinCommandsTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'visitor',
 		'object',
 		'debugger'
 	],
-	#category : #'NewTools-Sindarin-Commands-Tests'
+	#category : 'NewTools-Sindarin-Commands-Tests',
+	#package : 'NewTools-Sindarin-Commands-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 SindarinCommandsTest >> setUp [
 	super setUp.
 	
@@ -17,7 +18,7 @@ SindarinCommandsTest >> setUp [
 	object := SindarinTestObjectToVisit new
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 SindarinCommandsTest >> tearDown [
 
 	debugger ifNotNil: [ 
@@ -28,7 +29,7 @@ SindarinCommandsTest >> tearDown [
 	super tearDown
 ]
 
-{ #category : #'tests - step to instance creation' }
+{ #category : 'tests - step to instance creation' }
 SindarinCommandsTest >> testDebuggerOnNextInstanceCreation [
 
 	| command dummyActionModel |
@@ -46,7 +47,7 @@ SindarinCommandsTest >> testDebuggerOnNextInstanceCreation [
 	self assert: debugger session context receiver identicalTo: Object
 ]
 
-{ #category : #'tests - step to instance creation' }
+{ #category : 'tests - step to instance creation' }
 SindarinCommandsTest >> testNoNextInstanceCreationAfterMaxSearchDepth [
 
 	| command dummyActionModel |
@@ -67,7 +68,7 @@ SindarinCommandsTest >> testNoNextInstanceCreationAfterMaxSearchDepth [
 		equals: command notFoundInCurrentContextString
 ]
 
-{ #category : #'tests - step to instance creation' }
+{ #category : 'tests - step to instance creation' }
 SindarinCommandsTest >> testNoNextInstanceCreationBeforeContextReturn [
 
 	| command dummyActionModel |
@@ -84,7 +85,7 @@ SindarinCommandsTest >> testNoNextInstanceCreationBeforeContextReturn [
 	self assert: command errorString equals: command notFoundErrorString
 ]
 
-{ #category : #'tests - step to next call' }
+{ #category : 'tests - step to next call' }
 SindarinCommandsTest >> testStepToNextCallInClass [
 
 	| command dummyActionModel |
@@ -107,7 +108,7 @@ SindarinCommandsTest >> testStepToNextCallInClass [
 		identicalTo: visitor class >> #visitTestObject:
 ]
 
-{ #category : #'tests - step to next call' }
+{ #category : 'tests - step to next call' }
 SindarinCommandsTest >> testStepToNextCallInClassFailure [
 
 	| command dummyActionModel |
@@ -130,7 +131,7 @@ SindarinCommandsTest >> testStepToNextCallInClassFailure [
 		identicalTo: visitor class >> #doNotVisit:
 ]
 
-{ #category : #'tests - step to next call' }
+{ #category : 'tests - step to next call' }
 SindarinCommandsTest >> testStepToNextCallInClassNeverFinishes [
 
 	| command dummyActionModel |
@@ -155,7 +156,7 @@ SindarinCommandsTest >> testStepToNextCallInClassNeverFinishes [
 	self assert: debugger session context receiver equals: 10000
 ]
 
-{ #category : #'tests - step to next call' }
+{ #category : 'tests - step to next call' }
 SindarinCommandsTest >> testStepToNextCallInClassWithError [
 
 	| command dummyActionModel |
@@ -177,7 +178,7 @@ SindarinCommandsTest >> testStepToNextCallInClassWithError [
 		equals: #doesNotUnderstand:
 ]
 
-{ #category : #'tests - step to next call' }
+{ #category : 'tests - step to next call' }
 SindarinCommandsTest >> testStepToNextCallInObject [
 
 	| command originalReceiver dummyActionModel |
@@ -204,7 +205,7 @@ SindarinCommandsTest >> testStepToNextCallInObject [
 		identicalTo: originalReceiver
 ]
 
-{ #category : #'tests - step to instance creation' }
+{ #category : 'tests - step to instance creation' }
 SindarinCommandsTest >> testStepToNextInstanceCreation [
 
 	| command dummyActionModel |
diff --git a/src/NewTools-Sindarin-Commands-Tests/SindarinTestCommandDebugger.class.st b/src/NewTools-Sindarin-Commands-Tests/SindarinTestCommandDebugger.class.st
index 118ac86de..7d4706e2c 100644
--- a/src/NewTools-Sindarin-Commands-Tests/SindarinTestCommandDebugger.class.st
+++ b/src/NewTools-Sindarin-Commands-Tests/SindarinTestCommandDebugger.class.st
@@ -2,61 +2,62 @@
 I am a fake debugger to allow the testing of Sindarin debugger commands without side effects on a StDebugger instance. 
 "
 Class {
-	#name : #SindarinTestCommandDebugger,
-	#superclass : #Object,
+	#name : 'SindarinTestCommandDebugger',
+	#superclass : 'Object',
 	#instVars : [
 		'session',
 		'tag',
 		'debuggerActionModel'
 	],
-	#category : #'NewTools-Sindarin-Commands-Tests'
+	#category : 'NewTools-Sindarin-Commands-Tests',
+	#package : 'NewTools-Sindarin-Commands-Tests'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SindarinTestCommandDebugger >> debuggerActionModel [
 	^ debuggerActionModel ifNil: [ debuggerActionModel := StDebuggerActionModel on: self session ]
 ]
 
-{ #category : #removing }
+{ #category : 'removing' }
 SindarinTestCommandDebugger >> forceSessionUpdate [ 
 	tag := #forceSessionUpdate
 ]
 
-{ #category : #removing }
+{ #category : 'removing' }
 SindarinTestCommandDebugger >> removeSessionHolderSubscriptions [ 
 	tag := #removeSessionHolderSubscriptions
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SindarinTestCommandDebugger >> session [
 
 	^ session
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SindarinTestCommandDebugger >> session: anObject [
 
 	session := anObject.
 	session ifNotNil: [ self debuggerActionModel session: anObject ]
 ]
 
-{ #category : #removing }
+{ #category : 'removing' }
 SindarinTestCommandDebugger >> setSessionHolderSubscriptions [ 
 	tag := #setSessionHolderSubscriptions
 ]
 
-{ #category : #removing }
+{ #category : 'removing' }
 SindarinTestCommandDebugger >> sindarinDebugger [
 	^ SindarinDebugger attachTo: session
 ]
 
-{ #category : #removing }
+{ #category : 'removing' }
 SindarinTestCommandDebugger >> toolbar [
 
 	^ self
 ]
 
-{ #category : #gui }
+{ #category : 'gui' }
 SindarinTestCommandDebugger >> warning: aString for: aSindarinTestCommandDebugger [
 
 	^ self
diff --git a/src/NewTools-Sindarin-Commands-Tests/SindarinTestObjectToVisit.class.st b/src/NewTools-Sindarin-Commands-Tests/SindarinTestObjectToVisit.class.st
index 9484ba5e0..3c19daf94 100644
--- a/src/NewTools-Sindarin-Commands-Tests/SindarinTestObjectToVisit.class.st
+++ b/src/NewTools-Sindarin-Commands-Tests/SindarinTestObjectToVisit.class.st
@@ -2,64 +2,65 @@
 I am a dumb object that accept visitors, to test Sindarin commands.
 "
 Class {
-	#name : #SindarinTestObjectToVisit,
-	#superclass : #Object,
-	#category : #'NewTools-Sindarin-Commands-Tests'
+	#name : 'SindarinTestObjectToVisit',
+	#superclass : 'Object',
+	#category : 'NewTools-Sindarin-Commands-Tests',
+	#package : 'NewTools-Sindarin-Commands-Tests'
 }
 
-{ #category : #lessons }
+{ #category : 'lessons' }
 SindarinTestObjectToVisit class >> basicNewInstantiation [
 	^self basicNew
 ]
 
-{ #category : #lessons }
+{ #category : 'lessons' }
 SindarinTestObjectToVisit class >> newInstantiation [
 	^self new
 ]
 
-{ #category : #visitors }
+{ #category : 'visitors' }
 SindarinTestObjectToVisit >> acceptVisitor: aVisitor [
 
 	aVisitor visitTestObject: self
 ]
 
-{ #category : #visitors }
+{ #category : 'visitors' }
 SindarinTestObjectToVisit >> acceptVisitorMultipleObjects: aVisitor [
 
 	self class new acceptVisitor: aVisitor.
 	aVisitor visitTestObject: self
 ]
 
-{ #category : #visitors }
+{ #category : 'visitors' }
 SindarinTestObjectToVisit >> acceptVisitorNeverFinishes: aVisitor [
 	<compilerOptions: #(- optionInlineTimesRepeat)>
 	10000 timesRepeat: [ self doStuff ]
 ]
 
-{ #category : #visitors }
+{ #category : 'visitors' }
 SindarinTestObjectToVisit >> acceptVisitorWithError: visitor [
 	<ignoreNotImplementedSelectors: #(dnu)>
 	visitor dnu
   
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 SindarinTestObjectToVisit >> createInstanceWithBasicNew [
 	^self class basicNewInstantiation 
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 SindarinTestObjectToVisit >> createInstanceWithNew [
 	^self class newInstantiation 
 ]
 
-{ #category : #visitors }
+{ #category : 'visitors' }
 SindarinTestObjectToVisit >> doNotAcceptVisitor: aVisitor [
 
 	10 timesRepeat: [ self doStuff ]
 ]
 
-{ #category : #visitors }
+{ #category : 'visitors' }
 SindarinTestObjectToVisit >> doStuff [
 
 	^ self
diff --git a/src/NewTools-Sindarin-Commands-Tests/SindarinTestVisitor.class.st b/src/NewTools-Sindarin-Commands-Tests/SindarinTestVisitor.class.st
index d5cf24fde..721d78784 100644
--- a/src/NewTools-Sindarin-Commands-Tests/SindarinTestVisitor.class.st
+++ b/src/NewTools-Sindarin-Commands-Tests/SindarinTestVisitor.class.st
@@ -2,39 +2,40 @@
 I am a dumb visitor for sindarin command tests
 "
 Class {
-	#name : #SindarinTestVisitor,
-	#superclass : #Object,
-	#category : #'NewTools-Sindarin-Commands-Tests'
+	#name : 'SindarinTestVisitor',
+	#superclass : 'Object',
+	#category : 'NewTools-Sindarin-Commands-Tests',
+	#package : 'NewTools-Sindarin-Commands-Tests'
 }
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 SindarinTestVisitor >> doNotVisit: anObject [
 	anObject doNotAcceptVisitor: self
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 SindarinTestVisitor >> visit: anObject [
 	anObject acceptVisitor: self
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 SindarinTestVisitor >> visitMultipleObjects: anObject [
 	
 	anObject acceptVisitorMultipleObjects: self
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 SindarinTestVisitor >> visitNeverFinish: anObject [
 	anObject acceptVisitorNeverFinishes: self
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 SindarinTestVisitor >> visitTestObject: anObject [
 
 	^self
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 SindarinTestVisitor >> visitWithError: anObject [
 	anObject acceptVisitorWithError: self
 ]
diff --git a/src/NewTools-Sindarin-Commands-Tests/package.st b/src/NewTools-Sindarin-Commands-Tests/package.st
index dd7358b9e..a86cf2fad 100644
--- a/src/NewTools-Sindarin-Commands-Tests/package.st
+++ b/src/NewTools-Sindarin-Commands-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Sindarin-Commands-Tests' }
+Package { #name : 'NewTools-Sindarin-Commands-Tests' }
diff --git a/src/NewTools-Sindarin-ProcessInspector/StSindarinProcessInspectorPresenter.class.st b/src/NewTools-Sindarin-ProcessInspector/StSindarinProcessInspectorPresenter.class.st
index 167639e05..105d792fc 100644
--- a/src/NewTools-Sindarin-ProcessInspector/StSindarinProcessInspectorPresenter.class.st
+++ b/src/NewTools-Sindarin-ProcessInspector/StSindarinProcessInspectorPresenter.class.st
@@ -2,30 +2,31 @@
 Simple process inspector as a demo extension to show how extension work.
 "
 Class {
-	#name : #StSindarinProcessInspectorPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StSindarinProcessInspectorPresenter',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'attributesTable',
 		'sindarinDebugger',
 		'processData'
 	],
-	#category : #'NewTools-Sindarin-ProcessInspector'
+	#category : 'NewTools-Sindarin-ProcessInspector',
+	#package : 'NewTools-Sindarin-ProcessInspector'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSindarinProcessInspectorPresenter class >> debuggingExtensionToolName [
 	<debuggerExtensionOrder: 1 showByDefault: false>
 	^ 'Process'
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSindarinProcessInspectorPresenter class >> defaultSpec [
 	^ SpBoxLayout newVertical
 		add: #attributesTable;
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSindarinProcessInspectorPresenter >> initializePresenters [
 	super initializePresenters.
 	attributesTable := self newTable.
@@ -41,18 +42,18 @@ StSindarinProcessInspectorPresenter >> initializePresenters [
 			'terminated'}
 ]
 
-{ #category : #'accessing model' }
+{ #category : 'accessing model' }
 StSindarinProcessInspectorPresenter >> setModelBeforeInitialization: aStDebugger [
 	"My original model is the debugger presenter that I extend"	
 	sindarinDebugger := aStDebugger sindarinDebugger
 ]
 
-{ #category : #'accessing model' }
+{ #category : 'accessing model' }
 StSindarinProcessInspectorPresenter >> updatePresenter [
 	self updateProcessData
 ]
 
-{ #category : #'accessing model' }
+{ #category : 'accessing model' }
 StSindarinProcessInspectorPresenter >> updateProcessData [
 	|process|
 	processData := Dictionary new.
diff --git a/src/NewTools-Sindarin-ProcessInspector/package.st b/src/NewTools-Sindarin-ProcessInspector/package.st
index b41fefbc7..e2b9a3243 100644
--- a/src/NewTools-Sindarin-ProcessInspector/package.st
+++ b/src/NewTools-Sindarin-ProcessInspector/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Sindarin-ProcessInspector' }
+Package { #name : 'NewTools-Sindarin-ProcessInspector' }
diff --git a/src/NewTools-Sindarin-Tools/SindarinDebugger.extension.st b/src/NewTools-Sindarin-Tools/SindarinDebugger.extension.st
index ed55aa915..97839a146 100644
--- a/src/NewTools-Sindarin-Tools/SindarinDebugger.extension.st
+++ b/src/NewTools-Sindarin-Tools/SindarinDebugger.extension.st
@@ -1,23 +1,23 @@
-Extension { #name : #SindarinDebugger }
+Extension { #name : 'SindarinDebugger' }
 
-{ #category : #'*NewTools-Sindarin-Tools' }
+{ #category : '*NewTools-Sindarin-Tools' }
 SindarinDebugger class >> debuggerExtensionKey [
 	^ #sindarin
 ]
 
-{ #category : #'*NewTools-Sindarin-Tools' }
+{ #category : '*NewTools-Sindarin-Tools' }
 SindarinDebugger >> debuggerExtensionKey [
 	^self class debuggerExtensionKey
 ]
 
-{ #category : #'*NewTools-Sindarin-Tools' }
+{ #category : '*NewTools-Sindarin-Tools' }
 SindarinDebugger >> inspectionSindarinDebugger [
 	<inspectorPresentationOrder: -10 title: 'Sindarin'>
 
 	^ StSindarinDebuggerPresenter on: self
 ]
 
-{ #category : #'*NewTools-Sindarin-Tools' }
+{ #category : '*NewTools-Sindarin-Tools' }
 SindarinDebugger >> open [
 	"Open this debugger and the execution it is debugging in a graphical window"
 	"<inspectorPresentationOrder: -10 title: 'Sindarin'>"
diff --git a/src/NewTools-Sindarin-Tools/StBytecodeInspectorSlotNode.class.st b/src/NewTools-Sindarin-Tools/StBytecodeInspectorSlotNode.class.st
index 0ae4286bb..d2d82a3fd 100644
--- a/src/NewTools-Sindarin-Tools/StBytecodeInspectorSlotNode.class.st
+++ b/src/NewTools-Sindarin-Tools/StBytecodeInspectorSlotNode.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StBytecodeInspectorSlotNode,
-	#superclass : #StInspectorSlotNode,
-	#category : #'NewTools-Sindarin-Tools'
+	#name : 'StBytecodeInspectorSlotNode',
+	#superclass : 'StInspectorSlotNode',
+	#category : 'NewTools-Sindarin-Tools',
+	#package : 'NewTools-Sindarin-Tools'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StBytecodeInspectorSlotNode >> key [
 	^ 'rcvr: ' , (self slot index - 1) asString, ' [' , super key , ']'
 ]
diff --git a/src/NewTools-Sindarin-Tools/StDebugger.extension.st b/src/NewTools-Sindarin-Tools/StDebugger.extension.st
index 1a685ffd4..82b12d549 100644
--- a/src/NewTools-Sindarin-Tools/StDebugger.extension.st
+++ b/src/NewTools-Sindarin-Tools/StDebugger.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #StDebugger }
+Extension { #name : 'StDebugger' }
 
-{ #category : #'*NewTools-Sindarin-Tools' }
+{ #category : '*NewTools-Sindarin-Tools' }
 StDebugger >> sindarinDebugger [
 	^ SindarinDebugger attachTo: self session
 ]
diff --git a/src/NewTools-Sindarin-Tools/StSindarinBytecodeContextInspectorModel.class.st b/src/NewTools-Sindarin-Tools/StSindarinBytecodeContextInspectorModel.class.st
index 6247c7cd5..b871a6f4f 100644
--- a/src/NewTools-Sindarin-Tools/StSindarinBytecodeContextInspectorModel.class.st
+++ b/src/NewTools-Sindarin-Tools/StSindarinBytecodeContextInspectorModel.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StSindarinBytecodeContextInspectorModel,
-	#superclass : #StInspectorModel,
-	#category : #'NewTools-Sindarin-Tools'
+	#name : 'StSindarinBytecodeContextInspectorModel',
+	#superclass : 'StInspectorModel',
+	#category : 'NewTools-Sindarin-Tools',
+	#package : 'NewTools-Sindarin-Tools'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSindarinBytecodeContextInspectorModel >> allInspectorNodes [
 	| tempNodes slotNodes stackTopNode |
 	tempNodes := self contextTempNodes.
@@ -17,7 +18,7 @@ StSindarinBytecodeContextInspectorModel >> allInspectorNodes [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSindarinBytecodeContextInspectorModel >> contextReceiverSlotNodes [
 	^ self inspectedObject receiver class allSlots
 		collect: [ :each | 
@@ -26,14 +27,14 @@ StSindarinBytecodeContextInspectorModel >> contextReceiverSlotNodes [
 				slot: each ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSindarinBytecodeContextInspectorModel >> contextTempNodes [
 	^ self inspectedObject astScope allTemps collect: [ :temp | 
 		  (StInspectorTempNode hostObject: self inspectedObject) tempVariable: temp ]
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSindarinBytecodeContextInspectorModel >> stacktopNode [
 	^ StInspectorStackTopNode hostObject: self inspectedObject
 ]
diff --git a/src/NewTools-Sindarin-Tools/StSindarinBytecodeDebuggerPresenter.class.st b/src/NewTools-Sindarin-Tools/StSindarinBytecodeDebuggerPresenter.class.st
index e448e5294..6465c3f07 100644
--- a/src/NewTools-Sindarin-Tools/StSindarinBytecodeDebuggerPresenter.class.st
+++ b/src/NewTools-Sindarin-Tools/StSindarinBytecodeDebuggerPresenter.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #StSindarinBytecodeDebuggerPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StSindarinBytecodeDebuggerPresenter',
+	#superclass : 'SpPresenter',
 	#traits : 'TStDebuggerExtension',
 	#classTraits : 'TStDebuggerExtension classTrait',
 	#instVars : [
@@ -11,16 +11,17 @@ Class {
 		'bytecodeList',
 		'currentPC'
 	],
-	#category : #'NewTools-Sindarin-Tools'
+	#category : 'NewTools-Sindarin-Tools',
+	#package : 'NewTools-Sindarin-Tools'
 }
 
-{ #category : #'debugger extension' }
+{ #category : 'debugger extension' }
 StSindarinBytecodeDebuggerPresenter class >> defaultDisplayOrder [
 
 	^ 2
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StSindarinBytecodeDebuggerPresenter class >> defaultLayout [
 	^ SpBoxLayout newTopToBottom
 		add: #toolbar expand: false fill: false padding: 0;
@@ -29,18 +30,18 @@ StSindarinBytecodeDebuggerPresenter class >> defaultLayout [
 		yourself
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 StSindarinBytecodeDebuggerPresenter >> accept: aVisitor [
 
 	^ aVisitor visitBytecode: self
 ]
 
-{ #category : #'debugger extension' }
+{ #category : 'debugger extension' }
 StSindarinBytecodeDebuggerPresenter >> debuggerExtensionToolName [
 	^ 'Bytecode' 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSindarinBytecodeDebuggerPresenter >> initializePresenters [
 	bytecode := self newList.
 	bcContextInspection := nil inspectionRaw.
@@ -48,7 +49,7 @@ StSindarinBytecodeDebuggerPresenter >> initializePresenters [
 	self initializeToolbar
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSindarinBytecodeDebuggerPresenter >> initializeToolbar [
 	
 	toolbar := self newToolbar
@@ -57,25 +58,25 @@ StSindarinBytecodeDebuggerPresenter >> initializeToolbar [
 		fillWith: self toolbarActions
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSindarinBytecodeDebuggerPresenter >> setModelBeforeInitialization: aStDebugger [
 	"My original model is the debugger presenter that I extend"
 	debugger := aStDebugger.
 	sindarinDebugger := aStDebugger sindarinDebugger
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSindarinBytecodeDebuggerPresenter >> sindarin [
 	^sindarinDebugger 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSindarinBytecodeDebuggerPresenter >> stepBytecode [
 	self sindarin stepBytecode.
 	self debugger forceSessionUpdate 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSindarinBytecodeDebuggerPresenter >> toolbarActions [
 	| group |
 	group := (CmCommandGroup named: 'Bytecode Toolbar') asSpecGroup.
@@ -86,7 +87,7 @@ StSindarinBytecodeDebuggerPresenter >> toolbarActions [
 	^ group
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StSindarinBytecodeDebuggerPresenter >> updateBytecode [
 
 	| selectionIndex |
@@ -105,7 +106,7 @@ StSindarinBytecodeDebuggerPresenter >> updateBytecode [
 		bytecode selectIndex: selectionIndex ]
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StSindarinBytecodeDebuggerPresenter >> updatePresenter [
 	super updatePresenter.
 	self debugger interruptedContext isDead ifTrue:[ ^self ].
diff --git a/src/NewTools-Sindarin-Tools/StSindarinContextInteractionModel.class.st b/src/NewTools-Sindarin-Tools/StSindarinContextInteractionModel.class.st
index dbb9823b5..e30643a56 100644
--- a/src/NewTools-Sindarin-Tools/StSindarinContextInteractionModel.class.st
+++ b/src/NewTools-Sindarin-Tools/StSindarinContextInteractionModel.class.st
@@ -1,13 +1,14 @@
 Class {
-	#name : #StSindarinContextInteractionModel,
-	#superclass : #SpCodeScriptingInteractionModel,
+	#name : 'StSindarinContextInteractionModel',
+	#superclass : 'SpCodeScriptingInteractionModel',
 	#instVars : [
 		'context'
 	],
-	#category : #'NewTools-Sindarin-Tools'
+	#category : 'NewTools-Sindarin-Tools',
+	#package : 'NewTools-Sindarin-Tools'
 }
 
-{ #category : #binding }
+{ #category : 'binding' }
 StSindarinContextInteractionModel >> bindingOf: aString [
 	^ self bindings at: aString ifAbsent: [ 
 		  (context receiver class hasSlotNamed: aString)
@@ -15,17 +16,17 @@ StSindarinContextInteractionModel >> bindingOf: aString [
 			  ifFalse: [ context temporaryVariableNamed: aString ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSindarinContextInteractionModel >> context [
 	^ context
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSindarinContextInteractionModel >> context: anObject [
 	context := anObject
 ]
 
-{ #category : #binding }
+{ #category : 'binding' }
 StSindarinContextInteractionModel >> hasBindingOf: aString [
 	self bindings at: aString ifAbsent: [ 
 		^ (context receiver class hasSlotNamed: aString) or: [ 
diff --git a/src/NewTools-Sindarin-Tools/StSindarinDebuggerPresenter.class.st b/src/NewTools-Sindarin-Tools/StSindarinDebuggerPresenter.class.st
index f5f2e0c66..25d94d434 100644
--- a/src/NewTools-Sindarin-Tools/StSindarinDebuggerPresenter.class.st
+++ b/src/NewTools-Sindarin-Tools/StSindarinDebuggerPresenter.class.st
@@ -1,16 +1,17 @@
 Class {
-	#name : #StSindarinDebuggerPresenter,
-	#superclass : #StInspectionPresenter,
+	#name : 'StSindarinDebuggerPresenter',
+	#superclass : 'StInspectionPresenter',
 	#instVars : [
 		'currentNodeSource',
 		'stack',
 		'inspector',
 		'toolbar'
 	],
-	#category : #'NewTools-Sindarin-Tools'
+	#category : 'NewTools-Sindarin-Tools',
+	#package : 'NewTools-Sindarin-Tools'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 StSindarinDebuggerPresenter class >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
@@ -27,12 +28,12 @@ StSindarinDebuggerPresenter class >> defaultLayout [
 		yourself
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSindarinDebuggerPresenter class >> title [
 	^'Sindarin Debugger'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSindarinDebuggerPresenter >> buildToolbar [
 	| group |
 	group := CmCommandGroup forSpec.
@@ -44,7 +45,7 @@ StSindarinDebuggerPresenter >> buildToolbar [
 		fillWith: group
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSindarinDebuggerPresenter >> initializePresenters [
 	stack := self newList.
 	stack
@@ -75,19 +76,19 @@ StSindarinDebuggerPresenter >> initializePresenters [
 	toolbar := self buildToolbar
 ]
 
-{ #category : #stepping }
+{ #category : 'stepping' }
 StSindarinDebuggerPresenter >> refresh [ 
 	stack items: self model stack.
 	stack selectIndex: 1
 ]
 
-{ #category : #stepping }
+{ #category : 'stepping' }
 StSindarinDebuggerPresenter >> stepIn [ 
 	self model step.
 	self refresh
 ]
 
-{ #category : #stepping }
+{ #category : 'stepping' }
 StSindarinDebuggerPresenter >> stepOver [ 
 	self model stepOver.
 	self refresh
diff --git a/src/NewTools-Sindarin-Tools/StSindarinDebuggerScriptingPresenter.class.st b/src/NewTools-Sindarin-Tools/StSindarinDebuggerScriptingPresenter.class.st
index c2099027c..f83c444de 100644
--- a/src/NewTools-Sindarin-Tools/StSindarinDebuggerScriptingPresenter.class.st
+++ b/src/NewTools-Sindarin-Tools/StSindarinDebuggerScriptingPresenter.class.st
@@ -8,8 +8,8 @@ I provides ways to:
 My owner must be a spec debugger
 "
 Class {
-	#name : #StSindarinDebuggerScriptingPresenter,
-	#superclass : #SpPresenter,
+	#name : 'StSindarinDebuggerScriptingPresenter',
+	#superclass : 'SpPresenter',
 	#traits : 'TStDebuggerExtension',
 	#classTraits : 'TStDebuggerExtension classTrait',
 	#instVars : [
@@ -18,10 +18,11 @@ Class {
 		'toolbar',
 		'sindarinDebugger'
 	],
-	#category : #'NewTools-Sindarin-Tools'
+	#category : 'NewTools-Sindarin-Tools',
+	#package : 'NewTools-Sindarin-Tools'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 StSindarinDebuggerScriptingPresenter class >> defaultLayout [
 	^ SpBoxLayout newTopToBottom
 		add: #toolbar expand: false;
@@ -34,24 +35,24 @@ StSindarinDebuggerScriptingPresenter class >> defaultLayout [
 		yourself
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 StSindarinDebuggerScriptingPresenter >> accept: aVisitor [
 
 	^ aVisitor visitSindarin: self
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSindarinDebuggerScriptingPresenter >> createCommandFromScript [
 	self flag: 'todo'
 ]
 
-{ #category : #'debugger extension' }
+{ #category : 'debugger extension' }
 StSindarinDebuggerScriptingPresenter >> debuggerExtensionToolName [
 
 	^ 'Sindarin'
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSindarinDebuggerScriptingPresenter >> executeScript [
 
 	| stream result model receiver evaluationContext |
@@ -71,7 +72,7 @@ StSindarinDebuggerScriptingPresenter >> executeScript [
 		resultInspection update ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSindarinDebuggerScriptingPresenter >> initializePresenters [
 	code := self newCode.
 	code interactionModel: StSindarinContextInteractionModel new.
@@ -86,7 +87,7 @@ StSindarinDebuggerScriptingPresenter >> initializePresenters [
 	self initializeToolbar
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSindarinDebuggerScriptingPresenter >> initializeToolbar [
 
 	toolbar := self newToolbar
@@ -95,34 +96,34 @@ StSindarinDebuggerScriptingPresenter >> initializeToolbar [
 		fillWith: self toolbarActions
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSindarinDebuggerScriptingPresenter >> loadScript [
 	self flag: 'todo'
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSindarinDebuggerScriptingPresenter >> removeScriptCommand [
 	self flag: 'todo'
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSindarinDebuggerScriptingPresenter >> saveScript [
 	self flag: 'todo'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSindarinDebuggerScriptingPresenter >> setModelBeforeInitialization: aStDebugger [
 	"My original model is the debugger presenter that I extend"
 	debugger := aStDebugger.
 	sindarinDebugger := aStDebugger sindarinDebugger
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSindarinDebuggerScriptingPresenter >> sindarin [
 	^sindarinDebugger 
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StSindarinDebuggerScriptingPresenter >> toolbarActions [
 	| group |
 	group := (CmCommandGroup named: 'Toolbar') asSpecGroup.
@@ -137,7 +138,7 @@ StSindarinDebuggerScriptingPresenter >> toolbarActions [
 	^ group
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSindarinDebuggerScriptingPresenter >> updateCode [
 	code interactionModel context: self debugger currentContext.
 	code interactionModel bindings
@@ -145,7 +146,7 @@ StSindarinDebuggerScriptingPresenter >> updateCode [
 		put: (WorkspaceVariable key: #sindarin value: self sindarin)
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSindarinDebuggerScriptingPresenter >> updatePresenter [ 	
 	self updateCode.
 	super updatePresenter 
diff --git a/src/NewTools-Sindarin-Tools/package.st b/src/NewTools-Sindarin-Tools/package.st
index b9856b704..303ca6eaa 100644
--- a/src/NewTools-Sindarin-Tools/package.st
+++ b/src/NewTools-Sindarin-Tools/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Sindarin-Tools' }
+Package { #name : 'NewTools-Sindarin-Tools' }
diff --git a/src/NewTools-SpTextPresenterDecorators/RubUnderlinedSegmentMorph.extension.st b/src/NewTools-SpTextPresenterDecorators/RubUnderlinedSegmentMorph.extension.st
index 13e36a489..122c38bc5 100644
--- a/src/NewTools-SpTextPresenterDecorators/RubUnderlinedSegmentMorph.extension.st
+++ b/src/NewTools-SpTextPresenterDecorators/RubUnderlinedSegmentMorph.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #RubUnderlinedSegmentMorph }
+Extension { #name : 'RubUnderlinedSegmentMorph' }
 
-{ #category : #'*NewTools-SpTextPresenterDecorators' }
+{ #category : '*NewTools-SpTextPresenterDecorators' }
 RubUnderlinedSegmentMorph class >> on: aTextPresenterDecorator [
 	^ (self
 		   from: aTextPresenterDecorator start
diff --git a/src/NewTools-SpTextPresenterDecorators/SpAbstractTextPresenter.extension.st b/src/NewTools-SpTextPresenterDecorators/SpAbstractTextPresenter.extension.st
index 55c605dd1..fc7840a37 100644
--- a/src/NewTools-SpTextPresenterDecorators/SpAbstractTextPresenter.extension.st
+++ b/src/NewTools-SpTextPresenterDecorators/SpAbstractTextPresenter.extension.st
@@ -1,13 +1,13 @@
-Extension { #name : #SpAbstractTextPresenter }
+Extension { #name : 'SpAbstractTextPresenter' }
 
-{ #category : #'*NewTools-SpTextPresenterDecorators' }
+{ #category : '*NewTools-SpTextPresenterDecorators' }
 SpAbstractTextPresenter >> addTextSegmentDecoration: aDecorationSegment [
 
 	self withAdapterPerformOrDefer: [ :anAdapter | 
 		anAdapter addTextSegmentDecoration: aDecorationSegment ]
 ]
 
-{ #category : #'*NewTools-SpTextPresenterDecorators' }
+{ #category : '*NewTools-SpTextPresenterDecorators' }
 SpAbstractTextPresenter >> removeAllTextSegmentDecorations [
 
 	self withAdapterDo: [ :anAdapter | 
diff --git a/src/NewTools-SpTextPresenterDecorators/SpMorphicBaseTextAdapter.extension.st b/src/NewTools-SpTextPresenterDecorators/SpMorphicBaseTextAdapter.extension.st
index 1867b9d1d..1eaacb5e1 100644
--- a/src/NewTools-SpTextPresenterDecorators/SpMorphicBaseTextAdapter.extension.st
+++ b/src/NewTools-SpTextPresenterDecorators/SpMorphicBaseTextAdapter.extension.st
@@ -1,13 +1,13 @@
-Extension { #name : #SpMorphicBaseTextAdapter }
+Extension { #name : 'SpMorphicBaseTextAdapter' }
 
-{ #category : #'*NewTools-SpTextPresenterDecorators' }
+{ #category : '*NewTools-SpTextPresenterDecorators' }
 SpMorphicBaseTextAdapter >> addTextSegmentDecoration: aDecorationSegment [
 	
 	self widgetDo: [ :w | 
 		w addSegment: (RubUnderlinedSegmentMorph on: aDecorationSegment) ]
 ]
 
-{ #category : #'*NewTools-SpTextPresenterDecorators' }
+{ #category : '*NewTools-SpTextPresenterDecorators' }
 SpMorphicBaseTextAdapter >> removeAllTextSegmentDecorations [
 	
 	self widgetDo: [ :w | 
diff --git a/src/NewTools-SpTextPresenterDecorators/SpTextPresenterDecorator.class.st b/src/NewTools-SpTextPresenterDecorators/SpTextPresenterDecorator.class.st
index 5e9c45c70..448474f9e 100644
--- a/src/NewTools-SpTextPresenterDecorators/SpTextPresenterDecorator.class.st
+++ b/src/NewTools-SpTextPresenterDecorators/SpTextPresenterDecorator.class.st
@@ -6,8 +6,8 @@ For now, I can be composed of two styles, #highlight and #underlined.
 
 "
 Class {
-	#name : #SpTextPresenterDecorator,
-	#superclass : #Object,
+	#name : 'SpTextPresenterDecorator',
+	#superclass : 'Object',
 	#instVars : [
 		'highlightColor',
 		'underlineColor',
@@ -17,22 +17,23 @@ Class {
 		'title',
 		'interval'
 	],
-	#category : #'NewTools-SpTextPresenterDecorators'
+	#category : 'NewTools-SpTextPresenterDecorators',
+	#package : 'NewTools-SpTextPresenterDecorators'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator class >> defaultHighlightColor [
 		
 	^ Color orange alpha: 0.5
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator class >> defaultUnderlineColor [
 		
 	^ Color white alpha: 0
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 SpTextPresenterDecorator class >> forHighlight [
 
 	^ self new
@@ -41,95 +42,95 @@ SpTextPresenterDecorator class >> forHighlight [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator class >> highlightStyleName [
 
 	^ #highlight
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator class >> underlineStyleName [
 
 	^ #underline
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> borderColor [
 	^ borderColor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> borderColor: anObject [
 	borderColor := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> highlightColor [
 	^ highlightColor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> highlightColor: anObject [
 	highlightColor := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> icon [
 	^ icon
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> icon: anObject [
 	icon := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> iconBlock [
 	^ iconBlock
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> iconBlock: anObject [
 	iconBlock := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> interval [
 	^ interval
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> interval: anInterval [
 
 	interval := anInterval
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> start [ 
 	^interval first
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> stop [ 
 	^interval last
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> title [
 	^ title
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> title: anObject [
 	title := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> underlineColor [
 	^ underlineColor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpTextPresenterDecorator >> underlineColor: anObject [
 	underlineColor := anObject
 ]
diff --git a/src/NewTools-SpTextPresenterDecorators/SpTextPresenterDecoratorMorphicAdapterTest.class.st b/src/NewTools-SpTextPresenterDecorators/SpTextPresenterDecoratorMorphicAdapterTest.class.st
index 675d0d485..2795008a7 100644
--- a/src/NewTools-SpTextPresenterDecorators/SpTextPresenterDecoratorMorphicAdapterTest.class.st
+++ b/src/NewTools-SpTextPresenterDecorators/SpTextPresenterDecoratorMorphicAdapterTest.class.st
@@ -1,15 +1,16 @@
 Class {
-	#name : #SpTextPresenterDecoratorMorphicAdapterTest,
-	#superclass : #TestCase,
+	#name : 'SpTextPresenterDecoratorMorphicAdapterTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'decorator',
 		'adapter',
 		'widget'
 	],
-	#category : #'NewTools-SpTextPresenterDecorators'
+	#category : 'NewTools-SpTextPresenterDecorators',
+	#package : 'NewTools-SpTextPresenterDecorators'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 SpTextPresenterDecoratorMorphicAdapterTest >> setUp [
 	super setUp.
 	decorator := SpTextPresenterDecorator new.
@@ -23,7 +24,7 @@ SpTextPresenterDecoratorMorphicAdapterTest >> setUp [
 	widget := adapter widget
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 SpTextPresenterDecoratorMorphicAdapterTest >> testAddTextPresenterDecorator [
 	self assertEmpty: widget segments.
 	adapter addTextSegmentDecoration: decorator.
@@ -31,7 +32,7 @@ SpTextPresenterDecoratorMorphicAdapterTest >> testAddTextPresenterDecorator [
 	self assert: widget segments first class identicalTo: RubUnderlinedSegmentMorph 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 SpTextPresenterDecoratorMorphicAdapterTest >> testRemoveAllTextPresenterDecorators [
 	self assertEmpty: widget segments.
 	adapter addTextSegmentDecoration: decorator.
@@ -39,6 +40,6 @@ SpTextPresenterDecoratorMorphicAdapterTest >> testRemoveAllTextPresenterDecorato
 	self assertEmpty: widget segments
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 SpTextPresenterDecoratorMorphicAdapterTest >> testTransformTextPresenterDecoratorToSegment [
 ]
diff --git a/src/NewTools-SpTextPresenterDecorators/SpTextPresenterDecoratorTest.class.st b/src/NewTools-SpTextPresenterDecorators/SpTextPresenterDecoratorTest.class.st
index 32c3ee944..a1fc6e1cc 100644
--- a/src/NewTools-SpTextPresenterDecorators/SpTextPresenterDecoratorTest.class.st
+++ b/src/NewTools-SpTextPresenterDecorators/SpTextPresenterDecoratorTest.class.st
@@ -1,20 +1,21 @@
 Class {
-	#name : #SpTextPresenterDecoratorTest,
-	#superclass : #TestCase,
+	#name : 'SpTextPresenterDecoratorTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'decorator'
 	],
-	#category : #'NewTools-SpTextPresenterDecorators'
+	#category : 'NewTools-SpTextPresenterDecorators',
+	#package : 'NewTools-SpTextPresenterDecorators'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 SpTextPresenterDecoratorTest >> setUp [
 	super setUp.
 	decorator := SpTextPresenterDecorator new
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 SpTextPresenterDecoratorTest >> testForHighlight [
 
 	decorator := SpTextPresenterDecorator forHighlight.
@@ -27,7 +28,7 @@ SpTextPresenterDecoratorTest >> testForHighlight [
 		equals: SpTextPresenterDecorator defaultUnderlineColor
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 SpTextPresenterDecoratorTest >> testStartStop [
 	decorator interval: (0 to: 10).
 	self assert: decorator start equals: 0.
diff --git a/src/NewTools-SpTextPresenterDecorators/package.st b/src/NewTools-SpTextPresenterDecorators/package.st
index f4c9a919d..3c45bb9a1 100644
--- a/src/NewTools-SpTextPresenterDecorators/package.st
+++ b/src/NewTools-SpTextPresenterDecorators/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-SpTextPresenterDecorators' }
+Package { #name : 'NewTools-SpTextPresenterDecorators' }
diff --git a/src/NewTools-Spotter-Extensions/AbstractFileReference.extension.st b/src/NewTools-Spotter-Extensions/AbstractFileReference.extension.st
index a1a8e0605..9f1cb7f92 100644
--- a/src/NewTools-Spotter-Extensions/AbstractFileReference.extension.st
+++ b/src/NewTools-Spotter-Extensions/AbstractFileReference.extension.st
@@ -1,12 +1,12 @@
-Extension { #name : #AbstractFileReference }
+Extension { #name : 'AbstractFileReference' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 AbstractFileReference >> isZipFile [
 
 	^ self isFile and: [ #('zip' 'jar' 'ear' 'war') includes: self extension ]
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 AbstractFileReference >> spotterForDirectoriesFor: aStep [
 	<stSpotterOrder: 10>
 	
@@ -20,7 +20,7 @@ AbstractFileReference >> spotterForDirectoriesFor: aStep [
 			filter: StFilterSubstring ]
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 AbstractFileReference >> spotterForFilesFor: aStep [
 	<stSpotterOrder: 20>
 	
@@ -34,7 +34,7 @@ AbstractFileReference >> spotterForFilesFor: aStep [
 			filter: StFilterSubstring ]
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 AbstractFileReference >> spotterForZipDirectoriesFor: aStep [
 	<stSpotterOrder: 10>
 	| zipFileSystem |
@@ -51,7 +51,7 @@ AbstractFileReference >> spotterForZipDirectoriesFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 AbstractFileReference >> spotterForZipFilesFor: aStep [
 	<stSpotterOrder: 10>
 	| zipFileSystem |
diff --git a/src/NewTools-Spotter-Extensions/Behavior.extension.st b/src/NewTools-Spotter-Extensions/Behavior.extension.st
index 6248a4aef..9a69bd3ca 100644
--- a/src/NewTools-Spotter-Extensions/Behavior.extension.st
+++ b/src/NewTools-Spotter-Extensions/Behavior.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #Behavior }
+Extension { #name : 'Behavior' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Behavior >> spotterClassInstanceVariablesFor: aStep [
 	<stSpotterOrder: 25>
 	self isTrait
@@ -12,7 +12,7 @@ Behavior >> spotterClassInstanceVariablesFor: aStep [
 		filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Behavior >> spotterCompositionFor: aStep [
 	<stSpotterOrder: 25>
 
@@ -23,7 +23,7 @@ Behavior >> spotterCompositionFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Behavior >> spotterInstanceVariablesFor: aStep [
 	<stSpotterOrder: 20>
 	self isTrait
@@ -35,7 +35,7 @@ Behavior >> spotterInstanceVariablesFor: aStep [
 		filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Behavior >> spotterSubclassesFor: aStep [
 	<stSpotterOrder: 50>
 	aStep listProcessor
@@ -45,7 +45,7 @@ Behavior >> spotterSubclassesFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Behavior >> spotterSuperclassesFor: aStep [
 	<stSpotterOrder: 40>
 	
@@ -56,7 +56,7 @@ Behavior >> spotterSuperclassesFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Behavior >> spotterTraitUsersFor: aStep [
 	<stSpotterOrder: 20>
 	self isTrait ifFalse: [ ^ self ].
@@ -67,7 +67,7 @@ Behavior >> spotterTraitUsersFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Behavior >> spotterUsedSlotsFor: aStep [
 	<stSpotterOrder: 70>
 	aStep listProcessor
@@ -77,7 +77,7 @@ Behavior >> spotterUsedSlotsFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Behavior >> spotterUsedTraitsFor: aStep [
 	<stSpotterOrder: 60>
 	
diff --git a/src/NewTools-Spotter-Extensions/Class.extension.st b/src/NewTools-Spotter-Extensions/Class.extension.st
index c5e350af6..b77ddd035 100644
--- a/src/NewTools-Spotter-Extensions/Class.extension.st
+++ b/src/NewTools-Spotter-Extensions/Class.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #Class }
+Extension { #name : 'Class' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Class >> spotterClassMethodsFor: aStep [
 	<stSpotterOrder: 15>
 	
@@ -11,7 +11,7 @@ Class >> spotterClassMethodsFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Class >> spotterMethodsFor: aStep [
 	<stSpotterOrder: 10>
 	
@@ -22,7 +22,7 @@ Class >> spotterMethodsFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Class >> spotterReferenceFor: aStep [
 	<stSpotterOrder: 30>
 	
@@ -33,7 +33,7 @@ Class >> spotterReferenceFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Class >> spotterSuperClassMethodsFor: aStep [
 	<stSpotterOrder: 16>
 	|superclasses|
@@ -44,7 +44,7 @@ Class >> spotterSuperClassMethodsFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Class >> spotterSuperMethodsFor: aStep [
 	<stSpotterOrder: 11>
 	
diff --git a/src/NewTools-Spotter-Extensions/ClassDescription.extension.st b/src/NewTools-Spotter-Extensions/ClassDescription.extension.st
index 4f2b12b04..a8a12f45a 100644
--- a/src/NewTools-Spotter-Extensions/ClassDescription.extension.st
+++ b/src/NewTools-Spotter-Extensions/ClassDescription.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #ClassDescription }
+Extension { #name : 'ClassDescription' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 ClassDescription >> spotterPackageFor: aStep [
 	<stSpotterOrder: 50>
 	aStep listProcessor
diff --git a/src/NewTools-Spotter-Extensions/Collection.extension.st b/src/NewTools-Spotter-Extensions/Collection.extension.st
index e96fa2f8b..c9bc3efe9 100644
--- a/src/NewTools-Spotter-Extensions/Collection.extension.st
+++ b/src/NewTools-Spotter-Extensions/Collection.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #Collection }
+Extension { #name : 'Collection' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Collection >> spotterItemsFor: aStep [
 	<stSpotterOrder: 10>
 	| processor |
diff --git a/src/NewTools-Spotter-Extensions/CompiledMethod.extension.st b/src/NewTools-Spotter-Extensions/CompiledMethod.extension.st
index 6a0e032c0..7807ba4e7 100644
--- a/src/NewTools-Spotter-Extensions/CompiledMethod.extension.st
+++ b/src/NewTools-Spotter-Extensions/CompiledMethod.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #CompiledMethod }
+Extension { #name : 'CompiledMethod' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 CompiledMethod >> spotterForBytecodesFor: aStep [
 	<stSpotterOrder: 15>
 	
@@ -11,7 +11,7 @@ CompiledMethod >> spotterForBytecodesFor: aStep [
 		filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 CompiledMethod >> spotterForImplementorsFor: aStep [
 	<stSpotterOrder: 10>
 	
@@ -22,7 +22,7 @@ CompiledMethod >> spotterForImplementorsFor: aStep [
 			keyBinding: $m command
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 CompiledMethod >> spotterForMessagesFor: aStep [
 	<stSpotterOrder: 12>
 
@@ -34,7 +34,7 @@ CompiledMethod >> spotterForMessagesFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 CompiledMethod >> spotterForSendersFor: aStep [
 	<stSpotterOrder: 11>
 	aStep listProcessor
@@ -44,7 +44,7 @@ CompiledMethod >> spotterForSendersFor: aStep [
 			keyBinding: $n command
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 CompiledMethod >> spotterMethodClassFor: aStep [
 	<stSpotterOrder: 50>
 
@@ -55,7 +55,7 @@ CompiledMethod >> spotterMethodClassFor: aStep [
 			itemIconName: [ :item | item systemIconName ]
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 CompiledMethod >> spotterPreview: aBuilder [
 
 	^ aBuilder newCode
@@ -65,7 +65,7 @@ CompiledMethod >> spotterPreview: aBuilder [
 		yourself
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 CompiledMethod >> stActDefault [
 	^ self browse
 ]
diff --git a/src/NewTools-Spotter-Extensions/Dictionary.extension.st b/src/NewTools-Spotter-Extensions/Dictionary.extension.st
index bcb903e96..c7b3f8478 100644
--- a/src/NewTools-Spotter-Extensions/Dictionary.extension.st
+++ b/src/NewTools-Spotter-Extensions/Dictionary.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #Dictionary }
+Extension { #name : 'Dictionary' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Dictionary >> spotterForKeysFor: aStep [
 	<stSpotterOrder: 15>
 	aStep listProcessor
diff --git a/src/NewTools-Spotter-Extensions/GlobalVariable.extension.st b/src/NewTools-Spotter-Extensions/GlobalVariable.extension.st
index 32b019451..c2c238588 100644
--- a/src/NewTools-Spotter-Extensions/GlobalVariable.extension.st
+++ b/src/NewTools-Spotter-Extensions/GlobalVariable.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #GlobalVariable }
+Extension { #name : 'GlobalVariable' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 GlobalVariable >> spotterClassFor: aStep [
 	<stSpotterOrder: 50>
 	
@@ -11,7 +11,7 @@ GlobalVariable >> spotterClassFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 GlobalVariable >> spotterForReferencesFor: aStep [
 	<stSpotterOrder: 130>
 	aStep listProcessor
@@ -21,7 +21,7 @@ GlobalVariable >> spotterForReferencesFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 GlobalVariable >> stActDefault [
 	self value inspect
 ]
diff --git a/src/NewTools-Spotter-Extensions/KMDispatcher.extension.st b/src/NewTools-Spotter-Extensions/KMDispatcher.extension.st
index 193fd29aa..5aadffaac 100644
--- a/src/NewTools-Spotter-Extensions/KMDispatcher.extension.st
+++ b/src/NewTools-Spotter-Extensions/KMDispatcher.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #KMDispatcher }
+Extension { #name : 'KMDispatcher' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 KMDispatcher >> spotterForKeysFor: aStep [
 	<stSpotterOrder: 15>
 		
diff --git a/src/NewTools-Spotter-Extensions/MCPackage.extension.st b/src/NewTools-Spotter-Extensions/MCPackage.extension.st
index 614b32f5d..73d4249a4 100644
--- a/src/NewTools-Spotter-Extensions/MCPackage.extension.st
+++ b/src/NewTools-Spotter-Extensions/MCPackage.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #MCPackage }
+Extension { #name : 'MCPackage' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MCPackage >> spotterForPackageFor: aStep [
 	<stSpotterOrder: 2>
 
@@ -12,7 +12,7 @@ MCPackage >> spotterForPackageFor: aStep [
 		filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MCPackage >> spotterMonticelloWorkingCopyFor: aStep [
 	<stSpotterOrder: 1>
 
diff --git a/src/NewTools-Spotter-Extensions/MCVersionInfo.extension.st b/src/NewTools-Spotter-Extensions/MCVersionInfo.extension.st
index 58ebd4f96..f8391c438 100644
--- a/src/NewTools-Spotter-Extensions/MCVersionInfo.extension.st
+++ b/src/NewTools-Spotter-Extensions/MCVersionInfo.extension.st
@@ -1,12 +1,12 @@
-Extension { #name : #MCVersionInfo }
+Extension { #name : 'MCVersionInfo' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MCVersionInfo >> allAncestors [
 	^ (self allAncestorsTo: OrderedCollection new)
 		sort: [ :a :b | a timeStamp >= b timeStamp ]
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MCVersionInfo >> allAncestorsTo: aCollection [
 	self ancestors do: [ :versionInfo | 
 		" do not add/process ancestry-branches which have already been added/processed "
@@ -16,7 +16,7 @@ MCVersionInfo >> allAncestorsTo: aCollection [
 	^ aCollection
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MCVersionInfo >> spotterAncestorsFor: aStep [
 	<stSpotterOrder: 1>
 	self flag: 'rewrite for direct streaming - get rid of recursion'.
diff --git a/src/NewTools-Spotter-Extensions/MCWorkingCopy.extension.st b/src/NewTools-Spotter-Extensions/MCWorkingCopy.extension.st
index 439efc5af..88e49a0d0 100644
--- a/src/NewTools-Spotter-Extensions/MCWorkingCopy.extension.st
+++ b/src/NewTools-Spotter-Extensions/MCWorkingCopy.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #MCWorkingCopy }
+Extension { #name : 'MCWorkingCopy' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MCWorkingCopy >> spotterAllRepositoriesFor: aStep [
 	<stSpotterOrder: 20>
 	aStep listProcessor
@@ -13,7 +13,7 @@ MCWorkingCopy >> spotterAllRepositoriesFor: aStep [
 		filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MCWorkingCopy >> spotterAncestorsFor: aStep [
 	<stSpotterOrder: 2>
 	self flag: #maybeRewriteForDirectStreaming.
@@ -23,7 +23,7 @@ MCWorkingCopy >> spotterAncestorsFor: aStep [
 		filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MCWorkingCopy >> spotterCommit: workingCopy in: aRepository [
 	| newVersion |
 
@@ -35,7 +35,7 @@ MCWorkingCopy >> spotterCommit: workingCopy in: aRepository [
 		ensure: [ (MCVersionInspector new version: newVersion) show ]]
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MCWorkingCopy >> spotterMonticelloPackageFor: aStep [
 	<stSpotterOrder: 21>
 	
@@ -46,7 +46,7 @@ MCWorkingCopy >> spotterMonticelloPackageFor: aStep [
 		filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MCWorkingCopy >> spotterPackageFor: aStep [
 	<stSpotterOrder: 21>
 	self flag: #maybeRewriteForDirectStreaming.
@@ -61,7 +61,7 @@ MCWorkingCopy >> spotterPackageFor: aStep [
 		filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MCWorkingCopy >> spotterPackageRepositoriesFor: aStep [
 	<stSpotterOrder: 10>
 	aStep listProcessor
diff --git a/src/NewTools-Spotter-Extensions/MenuItemMorph.extension.st b/src/NewTools-Spotter-Extensions/MenuItemMorph.extension.st
index 20fdc10bb..88d0a4521 100644
--- a/src/NewTools-Spotter-Extensions/MenuItemMorph.extension.st
+++ b/src/NewTools-Spotter-Extensions/MenuItemMorph.extension.st
@@ -1,12 +1,12 @@
-Extension { #name : #MenuItemMorph }
+Extension { #name : 'MenuItemMorph' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MenuItemMorph >> spotterPreview: aBuilder [
 
 	^ self balloonText spotterPreview: aBuilder
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MenuItemMorph >> stActDefault [
 	self doButtonAction
 ]
diff --git a/src/NewTools-Spotter-Extensions/MetacelloAbstractPackageSpec.extension.st b/src/NewTools-Spotter-Extensions/MetacelloAbstractPackageSpec.extension.st
index f99c649ab..e52029508 100644
--- a/src/NewTools-Spotter-Extensions/MetacelloAbstractPackageSpec.extension.st
+++ b/src/NewTools-Spotter-Extensions/MetacelloAbstractPackageSpec.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #MetacelloAbstractPackageSpec }
+Extension { #name : 'MetacelloAbstractPackageSpec' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MetacelloAbstractPackageSpec >> spotterForIncludesFor: aStep [
 	<stSpotterOrder: 1>
 	aStep listProcessor
@@ -11,7 +11,7 @@ MetacelloAbstractPackageSpec >> spotterForIncludesFor: aStep [
 		wantsToDisplayOnEmptyQuery: true
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MetacelloAbstractPackageSpec >> spotterForRequiresFor: aStep [
 	<stSpotterOrder: 2>
 	aStep listProcessor
diff --git a/src/NewTools-Spotter-Extensions/MetacelloProject.extension.st b/src/NewTools-Spotter-Extensions/MetacelloProject.extension.st
index 6d101e65c..de6ded7c7 100644
--- a/src/NewTools-Spotter-Extensions/MetacelloProject.extension.st
+++ b/src/NewTools-Spotter-Extensions/MetacelloProject.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #MetacelloProject }
+Extension { #name : 'MetacelloProject' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MetacelloProject >> spotterForVersionsFor: aStep [
 	<stSpotterOrder: 1>
 	self flag: #maybeRewriteForDirectStreaming.
diff --git a/src/NewTools-Spotter-Extensions/MetacelloVersion.extension.st b/src/NewTools-Spotter-Extensions/MetacelloVersion.extension.st
index 0c3d6ad77..b8ab0346b 100644
--- a/src/NewTools-Spotter-Extensions/MetacelloVersion.extension.st
+++ b/src/NewTools-Spotter-Extensions/MetacelloVersion.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #MetacelloVersion }
+Extension { #name : 'MetacelloVersion' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MetacelloVersion >> spotterForGroupsFor: aStep [
 	<stSpotterOrder: 2>
 	aStep listProcessor
@@ -11,7 +11,7 @@ MetacelloVersion >> spotterForGroupsFor: aStep [
 		wantsToDisplayOnEmptyQuery: true
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 MetacelloVersion >> spotterForPackagesFor: aStep [
 	<stSpotterOrder: 3>
 	aStep listProcessor
diff --git a/src/NewTools-Spotter-Extensions/Morph.extension.st b/src/NewTools-Spotter-Extensions/Morph.extension.st
index c268dc216..4d37cf3e6 100644
--- a/src/NewTools-Spotter-Extensions/Morph.extension.st
+++ b/src/NewTools-Spotter-Extensions/Morph.extension.st
@@ -1,13 +1,13 @@
-Extension { #name : #Morph }
+Extension { #name : 'Morph' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Morph >> spotterForKeysFor: aStep [
 	<stSpotterOrder: 15>
 	(self hasProperty: #kmDispatcher) ifFalse: [^self].
 	self kmDispatcher spotterForKeysFor: aStep
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Morph >> spotterForSubmorphsFor: aStep [
 	<stSpotterOrder: 10>
 	self submorphs ifNil: [ ^ self ].
@@ -19,7 +19,7 @@ Morph >> spotterForSubmorphsFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Morph >> spotterPreview: aBuilder [
 
 	^ aBuilder newImage 
diff --git a/src/NewTools-Spotter-Extensions/Pragma.extension.st b/src/NewTools-Spotter-Extensions/Pragma.extension.st
index 587c44bab..70f5c1641 100644
--- a/src/NewTools-Spotter-Extensions/Pragma.extension.st
+++ b/src/NewTools-Spotter-Extensions/Pragma.extension.st
@@ -1,24 +1,24 @@
-Extension { #name : #Pragma }
+Extension { #name : 'Pragma' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Pragma >> spotterForBytecodesFor: aStep [
 	<stSpotterOrder: 15>
 	self method spotterForBytecodesFor: aStep
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Pragma >> spotterForImplementorsFor: aStep [
 	<stSpotterOrder: 10>
 	self method spotterForImplementorsFor: aStep
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Pragma >> spotterForSendersFor: aStep [
 	<stSpotterOrder: 10>
 	self method spotterForSendersFor: aStep
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Pragma >> stActDefault [
     ^ self method browse
 ]
diff --git a/src/NewTools-Spotter-Extensions/RPackage.extension.st b/src/NewTools-Spotter-Extensions/RPackage.extension.st
index fa2d9b869..6d6e109bb 100644
--- a/src/NewTools-Spotter-Extensions/RPackage.extension.st
+++ b/src/NewTools-Spotter-Extensions/RPackage.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #RPackage }
+Extension { #name : 'RPackage' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 RPackage >> spotterClassesFor: aStep [
 	<stSpotterOrder: 20>
 	aStep listProcessor
@@ -9,7 +9,7 @@ RPackage >> spotterClassesFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 RPackage >> spotterExtensionMethodsFor: aStep [
 	<stSpotterOrder: 30>
 	aStep listProcessor
@@ -18,7 +18,7 @@ RPackage >> spotterExtensionMethodsFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 RPackage >> spotterMonticelloPackageFor: aStep [
 	<stSpotterOrder: 41>
 	
@@ -31,7 +31,7 @@ RPackage >> spotterMonticelloPackageFor: aStep [
 		filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 RPackage >> spotterMonticelloWorkingCopyFor: aStep [
 	<stSpotterOrder: 42>
 	aStep listProcessor
@@ -43,7 +43,7 @@ RPackage >> spotterMonticelloWorkingCopyFor: aStep [
 		filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 RPackage >> spotterTagsFor: aStep [
 	<stSpotterOrder: 20>
 	self classTags size <= 1 ifTrue: [ ^ self ].
@@ -54,7 +54,7 @@ RPackage >> spotterTagsFor: aStep [
 			filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 RPackage >> stActDefault [
 
 	^ Smalltalk tools browser openOnPackage: self
diff --git a/src/NewTools-Spotter-Extensions/RPackageTag.extension.st b/src/NewTools-Spotter-Extensions/RPackageTag.extension.st
index ebb39544c..963eadcf0 100644
--- a/src/NewTools-Spotter-Extensions/RPackageTag.extension.st
+++ b/src/NewTools-Spotter-Extensions/RPackageTag.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #RPackageTag }
+Extension { #name : 'RPackageTag' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 RPackageTag >> spotterClassesFor: aStep [
 	<stSpotterOrder: 20>
 	aStep listProcessor
diff --git a/src/NewTools-Spotter-Extensions/ReflectiveMethod.extension.st b/src/NewTools-Spotter-Extensions/ReflectiveMethod.extension.st
index 5a2c286b2..217c3680c 100644
--- a/src/NewTools-Spotter-Extensions/ReflectiveMethod.extension.st
+++ b/src/NewTools-Spotter-Extensions/ReflectiveMethod.extension.st
@@ -1,30 +1,30 @@
-Extension { #name : #ReflectiveMethod }
+Extension { #name : 'ReflectiveMethod' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 ReflectiveMethod >> spotterForBytecodesFor: aStep [
 	<stSpotterOrder: 15>
 	compiledMethod spotterForBytecodesFor: aStep
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 ReflectiveMethod >> spotterForImplementorsFor: aStep [
 	<stSpotterOrder: 10>
 	self compiledMethod spotterForImplementorsFor: aStep
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 ReflectiveMethod >> spotterForMessagesFor: aStep [
 	<stSpotterOrder: 12>
 	self compiledMethod spotterForMessagesFor: aStep
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 ReflectiveMethod >> spotterForSendersFor: aStep [
 	<stSpotterOrder: 11>
 	self compiledMethod spotterForSendersFor: aStep
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 ReflectiveMethod >> spotterMethodClassFor: aStep [
 	<stSpotterOrder: 50>
 	self compiledMethod spotterMethodClassFor: aStep
diff --git a/src/NewTools-Spotter-Extensions/SettingNode.extension.st b/src/NewTools-Spotter-Extensions/SettingNode.extension.st
index 87d0591f1..38da4daa4 100644
--- a/src/NewTools-Spotter-Extensions/SettingNode.extension.st
+++ b/src/NewTools-Spotter-Extensions/SettingNode.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #SettingNode }
+Extension { #name : 'SettingNode' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 SettingNode >> spotterForSettingsFor: aStep [
 	<stSpotterOrder: 0>
 	self allChildren isEmpty ifTrue: [ ^ self ].
@@ -11,7 +11,7 @@ SettingNode >> spotterForSettingsFor: aStep [
 		filter: StFilterSubstring
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 SettingNode >> spotterLabel [
 
 	| label |
diff --git a/src/NewTools-Spotter-Extensions/SettingTree.extension.st b/src/NewTools-Spotter-Extensions/SettingTree.extension.st
index 9b8830846..4a704b755 100644
--- a/src/NewTools-Spotter-Extensions/SettingTree.extension.st
+++ b/src/NewTools-Spotter-Extensions/SettingTree.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #SettingTree }
+Extension { #name : 'SettingTree' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 SettingTree >> spotterForSettingsFor: aStep [
 	<stSpotterOrder: 0>
 	aStep listProcessor
diff --git a/src/NewTools-Spotter-Extensions/StEntry.extension.st b/src/NewTools-Spotter-Extensions/StEntry.extension.st
index c91f64b3e..947453e09 100644
--- a/src/NewTools-Spotter-Extensions/StEntry.extension.st
+++ b/src/NewTools-Spotter-Extensions/StEntry.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #StEntry }
+Extension { #name : 'StEntry' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 StEntry >> stActDefault [
 	^ content stActDefault 
 ]
diff --git a/src/NewTools-Spotter-Extensions/StFilterImplementor.class.st b/src/NewTools-Spotter-Extensions/StFilterImplementor.class.st
index 63d6e4b92..779d47fe8 100644
--- a/src/NewTools-Spotter-Extensions/StFilterImplementor.class.st
+++ b/src/NewTools-Spotter-Extensions/StFilterImplementor.class.st
@@ -2,32 +2,33 @@
 A filter for implementors. 
 "
 Class {
-	#name : #StFilterImplementor,
-	#superclass : #StFilterSubstring,
-	#category : #'NewTools-Spotter-Extensions'
+	#name : 'StFilterImplementor',
+	#superclass : 'StFilterSubstring',
+	#category : 'NewTools-Spotter-Extensions',
+	#package : 'NewTools-Spotter-Extensions'
 }
 
-{ #category : #public }
+{ #category : 'public' }
 StFilterImplementor class >> stListFilter [
 
 	^ StFilterSubstring new
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterImplementor >> applyFilterWithQuery [
 
 	super applyFilterWithQuery.
 	self filteredItems: (self filteredItems reject: [ :each | each isFromTrait ])
 ]
 
-{ #category : #'private - model' }
+{ #category : 'private - model' }
 StFilterImplementor >> itemFilterNameFor: each [
 
 	self flag: 'this filter wants to filter items by #selector (speed 10x), but dive-in-category wants to filter by #printString. Most filters in dive-in-category wants to filter by #printString, but not all. Others: files, topics, help, ... ?'.
 	^ each selector
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StFilterImplementor >> stListFilter [
 
 	^ StFilterSubstring new
diff --git a/src/NewTools-Spotter-Extensions/StSelector.class.st b/src/NewTools-Spotter-Extensions/StSelector.class.st
index 5924b9c15..61cb3b0a6 100644
--- a/src/NewTools-Spotter-Extensions/StSelector.class.st
+++ b/src/NewTools-Spotter-Extensions/StSelector.class.st
@@ -2,16 +2,17 @@
 A wrapper for selectors to be used in spotter (so they are something more than just symbols). 
 "
 Class {
-	#name : #StSelector,
-	#superclass : #Object,
+	#name : 'StSelector',
+	#superclass : 'Object',
 	#instVars : [
 		'name',
 		'methods'
 	],
-	#category : #'NewTools-Spotter-Extensions'
+	#category : 'NewTools-Spotter-Extensions',
+	#package : 'NewTools-Spotter-Extensions'
 }
 
-{ #category : #adding }
+{ #category : 'adding' }
 StSelector >> addMethod: aCompiledMethod [
 	"this is a private method that can be used by the constructor on the class side
 	exclusively within the context of Spotter"
@@ -19,35 +20,35 @@ StSelector >> addMethod: aCompiledMethod [
 	methods add: aCompiledMethod
 ]
 
-{ #category : #displaying }
+{ #category : 'displaying' }
 StSelector >> displayStringOn: stream [
 
 	stream nextPutAll: self name
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSelector >> implementors [
 	^ methods ifNil: [ 
 		methods := (SystemNavigation default allImplementorsOf: self name) 
 			collect: [ :each | each compiledMethod ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSelector >> name [
 	^ name
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSelector >> name: anObject [
 	name := anObject
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSelector >> senders [
 	^ SystemNavigation default allSendersOf: self name
 ]
 
-{ #category : #spotter }
+{ #category : 'spotter' }
 StSelector >> spotterUsersFor: aStep [
 	<stSpotterOrder: 50>
 
diff --git a/src/NewTools-Spotter-Extensions/SystemWindow.extension.st b/src/NewTools-Spotter-Extensions/SystemWindow.extension.st
index 8d2be56f9..28a11fbc1 100644
--- a/src/NewTools-Spotter-Extensions/SystemWindow.extension.st
+++ b/src/NewTools-Spotter-Extensions/SystemWindow.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #SystemWindow }
+Extension { #name : 'SystemWindow' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 SystemWindow >> stActDefault [
 
 	^ self isTopWindow
@@ -8,7 +8,7 @@ SystemWindow >> stActDefault [
 		ifFalse:[ self activate ]
 ]
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 SystemWindow >> stWindowsFor: aStep [
 	<stSpotterOrder: 100>
 
diff --git a/src/NewTools-Spotter-Extensions/package.st b/src/NewTools-Spotter-Extensions/package.st
index 6b2ac1868..ae16f30bb 100644
--- a/src/NewTools-Spotter-Extensions/package.st
+++ b/src/NewTools-Spotter-Extensions/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Spotter-Extensions' }
+Package { #name : 'NewTools-Spotter-Extensions' }
diff --git a/src/NewTools-Spotter-Processors-Tests/StAbstractProcessorTest.class.st b/src/NewTools-Spotter-Processors-Tests/StAbstractProcessorTest.class.st
index 7a9a4192b..528731bbb 100644
--- a/src/NewTools-Spotter-Processors-Tests/StAbstractProcessorTest.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StAbstractProcessorTest.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #StAbstractProcessorTest,
-	#superclass : #TestCase,
+	#name : 'StAbstractProcessorTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'text',
 		'candidates',
@@ -8,40 +8,41 @@ Class {
 		'processor',
 		'stream'
 	],
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StAbstractProcessorTest class >> isAbstract [ 
 
 	^ self == StAbstractProcessorTest
 ]
 
-{ #category : #asserting }
+{ #category : 'asserting' }
 StAbstractProcessorTest >> assertQuantityOfResults: anInteger [ 
 	
 	self assert: candidates results size equals: anInteger
 ]
 
-{ #category : #asserting }
+{ #category : 'asserting' }
 StAbstractProcessorTest >> assertResultsIncludes: anElement [ 
 	
 	self assert: ((candidates results collect: [:each | each content]) includes: anElement)
 ]
 
-{ #category : #asserting }
+{ #category : 'asserting' }
 StAbstractProcessorTest >> denyResultsIncludes: anElement [ 
 
 	self deny: ((candidates results collect: [:each | each content]) includes: anElement )
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StAbstractProcessorTest >> processor [
 
 	^ self subclassResponsibility 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StAbstractProcessorTest >> rerunWithText: aText [ 
 	
 	text := aText.
@@ -51,7 +52,7 @@ StAbstractProcessorTest >> rerunWithText: aText [
 	processor filterInContext: context
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StAbstractProcessorTest >> runForText: aText [
 
 	candidates := StMockCandidatesList new.
@@ -72,21 +73,21 @@ StAbstractProcessorTest >> runForText: aText [
 	processor filterInContext: context.
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StAbstractProcessorTest >> setUp [ 
 	
 	super setUp.
 	StDefaultSourceFactory forTest.
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StAbstractProcessorTest >> tearDown [ 
 
 	StSourceFactory reset.
 	super tearDown.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StAbstractProcessorTest >> testSearchingInvalidTextDoesNotReturnResult [
 
 	self runForText: 'assdsadasdsada'.
diff --git a/src/NewTools-Spotter-Processors-Tests/StBenchProcessors.class.st b/src/NewTools-Spotter-Processors-Tests/StBenchProcessors.class.st
index 98286f5e9..aa28f4d15 100644
--- a/src/NewTools-Spotter-Processors-Tests/StBenchProcessors.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StBenchProcessors.class.st
@@ -2,12 +2,13 @@
 I am a test class to measure the impact of the new implementation of spotter processors.
 "
 Class {
-	#name : #StBenchProcessors,
-	#superclass : #Object,
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#name : 'StBenchProcessors',
+	#superclass : 'Object',
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #benchmarking }
+{ #category : 'benchmarking' }
 StBenchProcessors >> benchClassFinding [
 	<script: 'self new benchClassFinding'>
 
@@ -32,7 +33,7 @@ StBenchProcessors >> benchClassFinding [
 
 ]
 
-{ #category : #benchmarking }
+{ #category : 'benchmarking' }
 StBenchProcessors >> benchImplementors [
 	<script: 'self new benchImplementors'>
 
@@ -57,7 +58,7 @@ StBenchProcessors >> benchImplementors [
 
 ]
 
-{ #category : #benchmarking }
+{ #category : 'benchmarking' }
 StBenchProcessors >> contextForText: aString [
 
 	| candidates stream |
@@ -78,19 +79,19 @@ StBenchProcessors >> contextForText: aString [
 	
 ]
 
-{ #category : #benchmarking }
+{ #category : 'benchmarking' }
 StBenchProcessors >> newClassProcessor [
 
 	^ StClassProcessor new
 ]
 
-{ #category : #benching }
+{ #category : 'benching' }
 StBenchProcessors >> newImplementorsProcessor [
 	
 	^ StImplementorsProcessor new
 ]
 
-{ #category : #benchmarking }
+{ #category : 'benchmarking' }
 StBenchProcessors >> oldClassProcessor [
 
 	^ StSpotterCandidatesListProcessor new
@@ -103,7 +104,7 @@ StBenchProcessors >> oldClassProcessor [
 		yourself
 ]
 
-{ #category : #benching }
+{ #category : 'benching' }
 StBenchProcessors >> oldImplementorsProcessor [
 
 	^ StSpotterCandidatesListProcessor new
@@ -114,7 +115,7 @@ StBenchProcessors >> oldImplementorsProcessor [
 		wantsToDisplayOnEmptyQuery: false
 ]
 
-{ #category : #benching }
+{ #category : 'benching' }
 StBenchProcessors >> runClassBenchMarksFor: aString resultsInto: aWriteStream for: processorName [
 	| context oldProcessor newProcessor oldBench newBench |
 	
diff --git a/src/NewTools-Spotter-Processors-Tests/StCamelCaseSplitTest.class.st b/src/NewTools-Spotter-Processors-Tests/StCamelCaseSplitTest.class.st
index 996b147a5..9a0550417 100644
--- a/src/NewTools-Spotter-Processors-Tests/StCamelCaseSplitTest.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StCamelCaseSplitTest.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StCamelCaseSplitTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#name : 'StCamelCaseSplitTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCamelCaseSplitTest >> testSingleLowercaseLetter [
 
 	self 
@@ -12,7 +13,7 @@ StCamelCaseSplitTest >> testSingleLowercaseLetter [
 		hasSameElements: {'a'}
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCamelCaseSplitTest >> testSingleUppercaseLetter [
 
 	self 
@@ -20,7 +21,7 @@ StCamelCaseSplitTest >> testSingleUppercaseLetter [
 		hasSameElements: { 'A' }
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCamelCaseSplitTest >> testSplittingShouldNotLosePrefix [
 
 	self 
@@ -28,7 +29,7 @@ StCamelCaseSplitTest >> testSplittingShouldNotLosePrefix [
 		hasSameElements: {'GTSpotter'}
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCamelCaseSplitTest >> testTwoDifferentWordsStartingWithLowerCase [
 
 	self 
@@ -36,7 +37,7 @@ StCamelCaseSplitTest >> testTwoDifferentWordsStartingWithLowerCase [
 		hasSameElements: {'an'. 'Object'}
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StCamelCaseSplitTest >> testTwoDifferentWordsStartingWithUpperCase [
 
 	self 
diff --git a/src/NewTools-Spotter-Processors-Tests/StClassProcessorTest.class.st b/src/NewTools-Spotter-Processors-Tests/StClassProcessorTest.class.st
index 4bbd4feb6..dce05baef 100644
--- a/src/NewTools-Spotter-Processors-Tests/StClassProcessorTest.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StClassProcessorTest.class.st
@@ -1,23 +1,24 @@
 Class {
-	#name : #StClassProcessorTest,
-	#superclass : #StAbstractProcessorTest,
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#name : 'StClassProcessorTest',
+	#superclass : 'StAbstractProcessorTest',
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StClassProcessorTest >> processor [
 
 	^ StClassProcessor new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StClassProcessorTest >> testFindGTClassProcessorTest [
 
 	self runForText: 'stclassprocessortest'.
 	self assertResultsIncludes: StClassProcessorTest
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StClassProcessorTest >> testFindGTClassProcessorTestAfterAddingTest [
 
 	self runForText: 'stclass'.
@@ -26,14 +27,14 @@ StClassProcessorTest >> testFindGTClassProcessorTestAfterAddingTest [
 	self assertResultsIncludes: StClassProcessorTest 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StClassProcessorTest >> testFindGTClassProcessorTestWithPartialText [
 
 	self runForText: 'stclass'.
 	self assertResultsIncludes: StClassProcessorTest
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StClassProcessorTest >> testGTClassProcessorIsRemovedAfterUpdatingText [
 
 	self runForText: 'gtclass'.
@@ -42,7 +43,7 @@ StClassProcessorTest >> testGTClassProcessorIsRemovedAfterUpdatingText [
 	self denyResultsIncludes: StClassProcessor
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StClassProcessorTest >> testPopularStringDoesReturnOnlyTenResults [
 
 	self runForText: 'test'.
diff --git a/src/NewTools-Spotter-Processors-Tests/StGeneratorBlockIteratorTest.class.st b/src/NewTools-Spotter-Processors-Tests/StGeneratorBlockIteratorTest.class.st
index 52b41ac5d..c34f6b93a 100644
--- a/src/NewTools-Spotter-Processors-Tests/StGeneratorBlockIteratorTest.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StGeneratorBlockIteratorTest.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StGeneratorBlockIteratorTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#name : 'StGeneratorBlockIteratorTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StGeneratorBlockIteratorTest >> testIteratorOnACalculatedCollectionReturnsOnlyFirst [
 
 	| it m |
@@ -18,7 +19,7 @@ StGeneratorBlockIteratorTest >> testIteratorOnACalculatedCollectionReturnsOnlyFi
 	self assert: m isCompiledMethod.	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StGeneratorBlockIteratorTest >> testIteratorWithEmptyBlockIsAtEnd [
 	| it |
 	
@@ -26,7 +27,7 @@ StGeneratorBlockIteratorTest >> testIteratorWithEmptyBlockIsAtEnd [
 	self assert: it atEnd.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StGeneratorBlockIteratorTest >> testIteratorWithInfiniteBlockNotCallIfNotUsed [
 	| it count |
 	
@@ -35,7 +36,7 @@ StGeneratorBlockIteratorTest >> testIteratorWithInfiniteBlockNotCallIfNotUsed [
 	self assert: count equals: 0.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StGeneratorBlockIteratorTest >> testIteratorWithInfiniteBlockOnlyCallFirstTimes [
 	| it count |
 	
@@ -45,7 +46,7 @@ StGeneratorBlockIteratorTest >> testIteratorWithInfiniteBlockOnlyCallFirstTimes
 	self assert: count equals: 5.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StGeneratorBlockIteratorTest >> testIteratorWithSingleElementIsAtEndAfterNext [
 	| it |
 	 
diff --git a/src/NewTools-Spotter-Processors-Tests/StGeneratorIteratorTest.class.st b/src/NewTools-Spotter-Processors-Tests/StGeneratorIteratorTest.class.st
index 9d3494897..8676aa425 100644
--- a/src/NewTools-Spotter-Processors-Tests/StGeneratorIteratorTest.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StGeneratorIteratorTest.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StGeneratorIteratorTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#name : 'StGeneratorIteratorTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StGeneratorIteratorTest >> testCollectionWithSingleElementReturnsIt [
 	| gen |
 	
@@ -12,7 +13,7 @@ StGeneratorIteratorTest >> testCollectionWithSingleElementReturnsIt [
 	self assert: gen next equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StGeneratorIteratorTest >> testCollectionWithSingleManyElementsReturnsTheRequested [
 	| gen |
 	
@@ -23,7 +24,7 @@ StGeneratorIteratorTest >> testCollectionWithSingleManyElementsReturnsTheRequest
 	self assert: gen next equals: 3.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StGeneratorIteratorTest >> testCollectionWithSingleManyElementsReturnsTheRequestedInCollection [
 	| gen |
 	
@@ -32,7 +33,7 @@ StGeneratorIteratorTest >> testCollectionWithSingleManyElementsReturnsTheRequest
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StGeneratorIteratorTest >> testCollectionWithSingleWithALotOfElementsReturnsTheRequestedInCollection [
 	| gen |
 	
@@ -41,7 +42,7 @@ StGeneratorIteratorTest >> testCollectionWithSingleWithALotOfElementsReturnsTheR
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StGeneratorIteratorTest >> testEmptyCollectionIsAtEnd [
 	| gen |
 	
@@ -49,7 +50,7 @@ StGeneratorIteratorTest >> testEmptyCollectionIsAtEnd [
 	self assert: gen atEnd
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StGeneratorIteratorTest >> testResetRestartsIterationOnTheCollection [
 	| gen |
 	
diff --git a/src/NewTools-Spotter-Processors-Tests/StHistoryProcessorTest.class.st b/src/NewTools-Spotter-Processors-Tests/StHistoryProcessorTest.class.st
index 1cc4ff605..c6485c7ad 100644
--- a/src/NewTools-Spotter-Processors-Tests/StHistoryProcessorTest.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StHistoryProcessorTest.class.st
@@ -1,20 +1,21 @@
 Class {
-	#name : #StHistoryProcessorTest,
-	#superclass : #StAbstractProcessorTest,
+	#name : 'StHistoryProcessorTest',
+	#superclass : 'StAbstractProcessorTest',
 	#instVars : [
 		'firstValue',
 		'secondValue'
 	],
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StHistoryProcessorTest >> processor [
 
 	^ StHistoryProcessor new
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StHistoryProcessorTest >> setUp [
 	super setUp. 
 	
@@ -25,14 +26,14 @@ StHistoryProcessorTest >> setUp [
 	StSpotter new historize: secondValue.
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StHistoryProcessorTest >> tearDown [
 
 	StSpotter resetHistory.
 	super tearDown
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StHistoryProcessorTest >> testEmptyQueryShowsResults [
 
 	self runForText: ''.
@@ -40,7 +41,7 @@ StHistoryProcessorTest >> testEmptyQueryShowsResults [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StHistoryProcessorTest >> testLookingHistoryQueryShowsResults [
 
 	self runForText: 'sthistory'.
@@ -48,7 +49,7 @@ StHistoryProcessorTest >> testLookingHistoryQueryShowsResults [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StHistoryProcessorTest >> testLookingSubstringShowsResults [
 
 	self runForText: 'unifi'.
diff --git a/src/NewTools-Spotter-Processors-Tests/StImplementorsProcessorTest.class.st b/src/NewTools-Spotter-Processors-Tests/StImplementorsProcessorTest.class.st
index 8a0a2fbf4..213f2e063 100644
--- a/src/NewTools-Spotter-Processors-Tests/StImplementorsProcessorTest.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StImplementorsProcessorTest.class.st
@@ -1,23 +1,24 @@
 Class {
-	#name : #StImplementorsProcessorTest,
-	#superclass : #StAbstractProcessorTest,
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#name : 'StImplementorsProcessorTest',
+	#superclass : 'StAbstractProcessorTest',
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StImplementorsProcessorTest >> processor [
 
 	^ StImplementorsProcessor new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StImplementorsProcessorTest >> testFindThisMethod [
 
 	self runForText: 'testFindThisMethod'.
 	self assertResultsIncludes: thisContext method
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StImplementorsProcessorTest >> testFindThisMethodAfterAddingText [
 
 	self runForText: 'test'.
@@ -26,14 +27,14 @@ StImplementorsProcessorTest >> testFindThisMethodAfterAddingText [
 	self assertResultsIncludes: thisContext method
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StImplementorsProcessorTest >> testPopularStringDoesReturnOnlyTenResults [
 
 	self runForText: 'test'.
 	self assertQuantityOfResults: 25.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StImplementorsProcessorTest >> testPopularStringDoesReturnOnlyTenResultsWithUppercase [
 
 	self runForText: 'Test'.
diff --git a/src/NewTools-Spotter-Processors-Tests/StIteratorsTest.class.st b/src/NewTools-Spotter-Processors-Tests/StIteratorsTest.class.st
index 10cdd2d07..8217b8bc1 100644
--- a/src/NewTools-Spotter-Processors-Tests/StIteratorsTest.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StIteratorsTest.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StIteratorsTest,
-	#superclass : #TestCase,
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#name : 'StIteratorsTest',
+	#superclass : 'TestCase',
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testBeginsWithFilterDoesNotFetchTwiceIfTheFilterIsARefinementOfPreviousText [
 
 	| it |
@@ -15,7 +16,7 @@ StIteratorsTest >> testBeginsWithFilterDoesNotFetchTwiceIfTheFilterIsARefinement
 	self assert: it next equals: 'bbb'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testBeginsWithFilterReturnsValidResults [
 
 	| it |
@@ -23,7 +24,7 @@ StIteratorsTest >> testBeginsWithFilterReturnsValidResults [
 	self assert: it next equals: 'bbb'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testBeginsWithFilterReturnsValidResultsWithTheSameFilter [
 
 	| it |
@@ -33,7 +34,7 @@ StIteratorsTest >> testBeginsWithFilterReturnsValidResultsWithTheSameFilter [
 	self assert: it next equals: 'bbb'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testIteratorOnACollectedCollectionIsFiltered [
 
 	| it |
@@ -44,7 +45,7 @@ StIteratorsTest >> testIteratorOnACollectedCollectionIsFiltered [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testIteratorOnACollectionIsFiltered [
 
 	| it |
@@ -55,7 +56,7 @@ StIteratorsTest >> testIteratorOnACollectionIsFiltered [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testIteratorOnACollectionReturnsTheCollection [
 
 	| it |
@@ -63,7 +64,7 @@ StIteratorsTest >> testIteratorOnACollectionReturnsTheCollection [
 	self assertCollection: (it next:3) hasSameElements: #(1 2 3)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testIteratorOnACollectionReturnsTheFirstValue [
 
 	| it |
@@ -72,7 +73,7 @@ StIteratorsTest >> testIteratorOnACollectionReturnsTheFirstValue [
 	self assert: (it next) equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testIteratorOnACollectionReturnsTheFirstValueAndSecondValue [
 
 	| it |
@@ -82,7 +83,7 @@ StIteratorsTest >> testIteratorOnACollectionReturnsTheFirstValueAndSecondValue [
 	self assert: (it next) equals: 2	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testIteratorOnACollectionWithCollectReturnsCorrectFirstValue [
 
 	| it |
@@ -91,7 +92,7 @@ StIteratorsTest >> testIteratorOnACollectionWithCollectReturnsCorrectFirstValue
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testIteratorOnACollectionWithCollectReturnsCorrectValues [
 
 	| it |
@@ -100,7 +101,7 @@ StIteratorsTest >> testIteratorOnACollectionWithCollectReturnsCorrectValues [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testIteratorOnACollectionWithTwoCollectReturnsCorrectFirstValue [
 
 	| it |
@@ -109,7 +110,7 @@ StIteratorsTest >> testIteratorOnACollectionWithTwoCollectReturnsCorrectFirstVal
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testIteratorOnACollectionWithTwoCollectReturnsCorrectValues [
 	| it |
 	
@@ -118,7 +119,7 @@ StIteratorsTest >> testIteratorOnACollectionWithTwoCollectReturnsCorrectValues [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testNonDuplicatesRemoveDuplicates [
 
 	| it |
@@ -127,7 +128,7 @@ StIteratorsTest >> testNonDuplicatesRemoveDuplicates [
 	self assert: (it next:1) equals: #(1) asOrderedCollection
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testNonDuplicatesRemoveDuplicatesResetReturnsWithoutDuplicates [
 
 	| it |
@@ -140,7 +141,7 @@ StIteratorsTest >> testNonDuplicatesRemoveDuplicatesResetReturnsWithoutDuplicate
 	self assert: (it next:3) equals: #(1 2 3) asOrderedCollection 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testNonDuplicatesRemoveDuplicatesWithThree [
 	| it |
 	
@@ -148,7 +149,7 @@ StIteratorsTest >> testNonDuplicatesRemoveDuplicatesWithThree [
 	self assert: (it next:3) equals: #(1 2 3) asOrderedCollection 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testSequenceDetectsAtEnd [
 
 	| it |
@@ -162,7 +163,7 @@ StIteratorsTest >> testSequenceDetectsAtEnd [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testSequenceReturnsTheSequenceOfAllResults [
 	| it |
 	
@@ -170,7 +171,7 @@ StIteratorsTest >> testSequenceReturnsTheSequenceOfAllResults [
 	self assertCollection: (it next: 6) hasSameElements: #(1 2 3 4 5 6)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testSequenceReturnsTheSequenceOfAllResultsInParts [
 	| it |
 	
@@ -180,7 +181,7 @@ StIteratorsTest >> testSequenceReturnsTheSequenceOfAllResultsInParts [
 	self assertCollection: (it next: 3) hasSameElements: #(4 5 6)	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testSubstringFilterDoesNotFetchTwiceIfTheFilterIsARefinementOfPreviousText [
 
 	| it |
@@ -191,7 +192,7 @@ StIteratorsTest >> testSubstringFilterDoesNotFetchTwiceIfTheFilterIsARefinementO
 	self assert: it next equals: '1bbb'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testSubstringFilterReturnsValidResults [
 
 	| it |
@@ -199,7 +200,7 @@ StIteratorsTest >> testSubstringFilterReturnsValidResults [
 	self assert: it next equals: 'xxxbbb'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testSubstringFilterReturnsValidResultsWithTheSameFilter [
 	| it |
 
@@ -209,7 +210,7 @@ StIteratorsTest >> testSubstringFilterReturnsValidResultsWithTheSameFilter [
 	self assert: it next equals: 'xxxbbb'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testWordsAwareIteratorFiltersByASequenceOfCamelCase [
 
 	| inner it |
@@ -225,7 +226,7 @@ StIteratorsTest >> testWordsAwareIteratorFiltersByASequenceOfCamelCase [
 	self assert: it next equals: 'xxxcccbbb'	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testWordsAwareIteratorFiltersByASequenceOfCamelCaseMixingCase [
 
 	| inner it |
@@ -242,7 +243,7 @@ StIteratorsTest >> testWordsAwareIteratorFiltersByASequenceOfCamelCaseMixingCase
 	self assert: it next equals: 'xxxcccbbb'	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testWordsAwareIteratorFiltersByASequenceOfCamelCaseWithUppercase [
 
 	| inner it |
@@ -258,7 +259,7 @@ StIteratorsTest >> testWordsAwareIteratorFiltersByASequenceOfCamelCaseWithUpperc
 	self assert: it next equals: 'xxxcccbbb'	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testWordsAwareIteratorFiltersByASequenceOfWords [
 
 	| inner it |
@@ -274,7 +275,7 @@ StIteratorsTest >> testWordsAwareIteratorFiltersByASequenceOfWords [
 	self assert: it next equals: 'xxxcccbbb'	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testWordsAwareIteratorFiltersByASingleWord [
 
 	| inner it |
@@ -290,7 +291,7 @@ StIteratorsTest >> testWordsAwareIteratorFiltersByASingleWord [
 	self assert: it next equals: 'xxxcccbbb'	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testWordsAwareIteratorFiltersByASingleWordFindingNothing [
 
 	| inner it |
@@ -305,7 +306,7 @@ StIteratorsTest >> testWordsAwareIteratorFiltersByASingleWordFindingNothing [
 	self assert: it next equals: nil
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StIteratorsTest >> testWordsAwareIteratorFiltersLeftOutBecauseSecondWord [
 
 	| inner it |
diff --git a/src/NewTools-Spotter-Processors-Tests/StMockCandidatesList.class.st b/src/NewTools-Spotter-Processors-Tests/StMockCandidatesList.class.st
index 937d88a22..9456fe29b 100644
--- a/src/NewTools-Spotter-Processors-Tests/StMockCandidatesList.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StMockCandidatesList.class.st
@@ -1,21 +1,22 @@
 Class {
-	#name : #StMockCandidatesList,
-	#superclass : #Object,
+	#name : 'StMockCandidatesList',
+	#superclass : 'Object',
 	#instVars : [
 		'results',
 		'totalResults'
 	],
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #adding }
+{ #category : 'adding' }
 StMockCandidatesList >> addAllCandidates: aCollection in: aProcessor [
 
 	results removeAll.
 	results addAll: aCollection
 ]
 
-{ #category : #adding }
+{ #category : 'adding' }
 StMockCandidatesList >> addCandidate: anEntry in: aProcessor [
 
 	results add: anEntry 
@@ -23,51 +24,51 @@ StMockCandidatesList >> addCandidate: anEntry in: aProcessor [
 	
 ]
 
-{ #category : #adding }
+{ #category : 'adding' }
 StMockCandidatesList >> addObject: anObject inProcessor: aProcessor [
 
 	results add: anObject
 ]
 
-{ #category : #adding }
+{ #category : 'adding' }
 StMockCandidatesList >> addObjects: aCollection inProcessor: aProcessor [
 
 	results addAll: aCollection
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StMockCandidatesList >> initialize [ 
 	
 	super initialize.
 	results := OrderedCollection new
 ]
 
-{ #category : #adding }
+{ #category : 'adding' }
 StMockCandidatesList >> onAmountChanged: aQuantity in: processor [
 
 	totalResults := aQuantity
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StMockCandidatesList >> processorEnded: aSptClassProcessor [ 
 
 	
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StMockCandidatesList >> processorStarted: aSptClassProcessor [ 
 	
 	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StMockCandidatesList >> reset [
 	
 	results removeAll.
 	totalResults := 0.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StMockCandidatesList >> results [
 	^ results
 ]
diff --git a/src/NewTools-Spotter-Processors-Tests/StMockSpotterStream.class.st b/src/NewTools-Spotter-Processors-Tests/StMockSpotterStream.class.st
index a11a221ba..201fd29d7 100644
--- a/src/NewTools-Spotter-Processors-Tests/StMockSpotterStream.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StMockSpotterStream.class.st
@@ -1,10 +1,12 @@
 Class {
-	#name : #StMockSpotterStream,
-	#superclass : #StSpotterStream,
-	#category : #'NewTools-Spotter-Processors-Tests-Scripting-Mocks'
+	#name : 'StMockSpotterStream',
+	#superclass : 'StSpotterStream',
+	#category : 'NewTools-Spotter-Processors-Tests-Scripting-Mocks',
+	#package : 'NewTools-Spotter-Processors-Tests',
+	#tag : 'Scripting-Mocks'
 }
 
-{ #category : #performing }
+{ #category : 'performing' }
 StMockSpotterStream >> performSymbol: aSymbol withArguments: aCollection [
 	self receiver perform: aSymbol withEnoughArguments: aCollection
 ]
diff --git a/src/NewTools-Spotter-Processors-Tests/StPackageProcessorTest.class.st b/src/NewTools-Spotter-Processors-Tests/StPackageProcessorTest.class.st
index 60e94575a..6ec21c591 100644
--- a/src/NewTools-Spotter-Processors-Tests/StPackageProcessorTest.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StPackageProcessorTest.class.st
@@ -1,23 +1,24 @@
 Class {
-	#name : #StPackageProcessorTest,
-	#superclass : #StAbstractProcessorTest,
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#name : 'StPackageProcessorTest',
+	#superclass : 'StAbstractProcessorTest',
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPackageProcessorTest >> processor [
 
 	^ StPackageProcessor new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPackageProcessorTest >> testFindThisPackage [
 
 	self runForText: 'newtools-spotter-processors-tests'.
 	self assertResultsIncludes: self class package
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPackageProcessorTest >> testFindThisPackageAfterAddingText [
 
 	self runForText: 'newtools-spo'.
@@ -28,7 +29,7 @@ StPackageProcessorTest >> testFindThisPackageAfterAddingText [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPackageProcessorTest >> testGTSpotterNewIsRemovedAfterAddingText [
 
 	self runForText: 'gt-spotter'.
@@ -37,7 +38,7 @@ StPackageProcessorTest >> testGTSpotterNewIsRemovedAfterAddingText [
 	self denyResultsIncludes: StClassProcessor package
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StPackageProcessorTest >> testPopularStringDoesReturnOnlyTenResults [
 
 	self runForText: 'test'.
diff --git a/src/NewTools-Spotter-Processors-Tests/StUnifiedProcessorTest.class.st b/src/NewTools-Spotter-Processors-Tests/StUnifiedProcessorTest.class.st
index 028b70b1f..3e01cd0e9 100644
--- a/src/NewTools-Spotter-Processors-Tests/StUnifiedProcessorTest.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StUnifiedProcessorTest.class.st
@@ -1,16 +1,17 @@
 Class {
-	#name : #StUnifiedProcessorTest,
-	#superclass : #StAbstractProcessorTest,
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#name : 'StUnifiedProcessorTest',
+	#superclass : 'StAbstractProcessorTest',
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> processor [
 
 	^ StUnifiedProcessor new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindCloseEnoughMethod [
 
 	self runForText: 'yourself'.
@@ -18,14 +19,14 @@ StUnifiedProcessorTest >> testFindCloseEnoughMethod [
 	self assertResultsIncludes: Object >> #yourself
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindStClassProcessorTest [
 
 	self runForText: 'stunifiedprocessortest'.
 	self assertResultsIncludes: StUnifiedProcessorTest
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindStClassProcessorTestAfterAddingTest [
 
 	self runForText: 'stun'.
@@ -34,21 +35,21 @@ StUnifiedProcessorTest >> testFindStClassProcessorTestAfterAddingTest [
 	self assertResultsIncludes: self class
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindStClassProcessorTestWithPartialText [
 
 	self runForText: 'stunifi'.
 	self assertResultsIncludes: self class
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindThisMethod [
 
 	self runForText: 'testFindThisMethod'.
 	self assertResultsIncludes: thisContext method
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindThisMethodAfterAddingText [
 
 	self runForText: 'test'.
@@ -57,21 +58,21 @@ StUnifiedProcessorTest >> testFindThisMethodAfterAddingText [
 	self assertResultsIncludes: thisContext method
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindThisMethodWithFullClass [
 
 	self runForText: 'StUnifiedProcessorTest >> #testFindThisMethod'.
 	self assertResultsIncludes: thisContext method
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindThisMethodWithFullClassDoesNotIncludeOtherClassMethod [
 
 	self runForText: 'StUnifiedProcessorTest >> #testFindThisMethod'.
 	self denyResultsIncludes: StImplementorsProcessorTest >> #testFindThisMethod
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindThisMethodWithFullClassIsTheCorrectclass [
 
 	self runForText: 'StUnifiedProcessorTest >> #testFindThisMethod'.
@@ -81,14 +82,14 @@ StUnifiedProcessorTest >> testFindThisMethodWithFullClassIsTheCorrectclass [
 				allSatisfy: [ :aMethod | aMethod methodClass = self class ])
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindThisPackage [
 
 	self runForText: 'newtools-spotter-processors'.
 	self assertResultsIncludes: StUnifiedProcessorTest package
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindThisPackageAfterAddingText [
 
 	self runForText: 'newtools-spo'.
@@ -99,21 +100,21 @@ StUnifiedProcessorTest >> testFindThisPackageAfterAddingText [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindThisPackageWithCategory [
 
 	self runForText: '#Packages newtools-spotter-processors'.
 	self assertResultsIncludes: StUnifiedProcessorTest package
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testFindThisPackageWithOtherCategory [
 
 	self runForText: '#Classes newtools-spotter-processors'.
 	self denyResultsIncludes: self class package
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testGTClassProcessorIsRemovedAfterUpdatingText [
 
 	self runForText: 'stclass'.
@@ -122,7 +123,7 @@ StUnifiedProcessorTest >> testGTClassProcessorIsRemovedAfterUpdatingText [
 	self denyResultsIncludes: StClassProcessor
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testGTSpotterNewIsRemovedAfterAddingText [
 
 	self runForText: 'newtools-spotter'.
@@ -131,56 +132,56 @@ StUnifiedProcessorTest >> testGTSpotterNewIsRemovedAfterAddingText [
 	self denyResultsIncludes: StClassProcessor package
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testLookingForDiskStoreWithSpaceReturnsDiskStore [
 
 	self runForText: 'Disk Store'.
 	self assertResultsIncludes: DiskStore
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testLookingForStoreDiskLowercaseReturnsThisMethod [
 
 	self runForText: 'store disk'.
 	self assertResultsIncludes: StUnifiedProcessorTest >> #testLookingForStoreDiskLowercaseReturnsThisMethod
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testLookingForStoreDiskReturnsDiskStore [
 
 	self runForText: 'StoreDisk'.
 	self assertResultsIncludes: DiskStore
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testLookingForStoreDiskWithSpaceReturnsDiskStore [
 
 	self runForText: 'Store Disk'.
 	self assertResultsIncludes: DiskStore
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testLookingForStoreLowercaseReturnsDiskStore [
 
 	self runForText: 'store disk'.
 	self assertResultsIncludes: DiskStore
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testPopularStringDoesReturnOnlyTwentyResults [
 
 	self runForText: 'test'.
 	self assertQuantityOfResults: 25.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testPopularStringDoesReturnOnlyTwentyResultsForPackage [
 
 	self runForText: '-Test'.
 	self assertQuantityOfResults: 25.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StUnifiedProcessorTest >> testPopularStringDoesReturnOnlyTwentyResultsWithCapital [
 
 	self runForText: 'Test'.
diff --git a/src/NewTools-Spotter-Processors-Tests/StWindowsProcessorTest.class.st b/src/NewTools-Spotter-Processors-Tests/StWindowsProcessorTest.class.st
index 2788c5b45..94bdb886c 100644
--- a/src/NewTools-Spotter-Processors-Tests/StWindowsProcessorTest.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StWindowsProcessorTest.class.st
@@ -1,21 +1,22 @@
 Class {
-	#name : #StWindowsProcessorTest,
-	#superclass : #StAbstractProcessorTest,
+	#name : 'StWindowsProcessorTest',
+	#superclass : 'StAbstractProcessorTest',
 	#instVars : [
 		'backWindow1',
 		'backWindow2',
 		'topMostWindow'
 	],
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWindowsProcessorTest >> processor [
 
 	^ StWindowsProcessor new
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StWindowsProcessorTest >> setUp [
 
 	super setUp.
@@ -25,7 +26,7 @@ StWindowsProcessorTest >> setUp [
 	
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StWindowsProcessorTest >> tearDown [
 
 	{backWindow1. backWindow2. topMostWindow} 
@@ -34,7 +35,7 @@ StWindowsProcessorTest >> tearDown [
 	super tearDown.	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWindowsProcessorTest >> testBackWindowsAreFind [
 
 	self runForText: 'back'.
@@ -42,7 +43,7 @@ StWindowsProcessorTest >> testBackWindowsAreFind [
 	self assertResultsIncludes: backWindow2.	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWindowsProcessorTest >> testBackWindowsAreFindWhenUsingSubstring [
 
 	self runForText: 'wind'.
@@ -50,7 +51,7 @@ StWindowsProcessorTest >> testBackWindowsAreFindWhenUsingSubstring [
 	self assertResultsIncludes: backWindow2.	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWindowsProcessorTest >> testBackWindowsAreShown [
 
 	self runForText: ''.
@@ -58,14 +59,14 @@ StWindowsProcessorTest >> testBackWindowsAreShown [
 	self assertResultsIncludes: backWindow2.	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWindowsProcessorTest >> testEmptyQueryShowsResults [
 
 	self runForText: ''.
 	self assertResultsIncludes: backWindow1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWindowsProcessorTest >> testTopMostWindowIsNotShown [
 
 	self runForText: ''.
diff --git a/src/NewTools-Spotter-Processors-Tests/StWorldMenuProcessorTest.class.st b/src/NewTools-Spotter-Processors-Tests/StWorldMenuProcessorTest.class.st
index e248135f3..4d8801a31 100644
--- a/src/NewTools-Spotter-Processors-Tests/StWorldMenuProcessorTest.class.st
+++ b/src/NewTools-Spotter-Processors-Tests/StWorldMenuProcessorTest.class.st
@@ -1,28 +1,29 @@
 Class {
-	#name : #StWorldMenuProcessorTest,
-	#superclass : #StAbstractProcessorTest,
-	#category : #'NewTools-Spotter-Processors-Tests'
+	#name : 'StWorldMenuProcessorTest',
+	#superclass : 'StAbstractProcessorTest',
+	#category : 'NewTools-Spotter-Processors-Tests',
+	#package : 'NewTools-Spotter-Processors-Tests'
 }
 
-{ #category : #asserting }
+{ #category : 'asserting' }
 StWorldMenuProcessorTest >> assertResultsIncludesMenuEntry: aString [ 
 	
 	self assert: (candidates results anySatisfy: [:each | each content contents = aString ])
 ]
 
-{ #category : #asserting }
+{ #category : 'asserting' }
 StWorldMenuProcessorTest >> denyResultsIncludesMenuEntry: aString [ 
 	
 	self assert: (candidates results noneSatisfy: [:each | each content contents = aString ])
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWorldMenuProcessorTest >> processor [
 
 	^ StWorldMenuProcessor new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWorldMenuProcessorTest >> testEmptyQueryShowsResults [
 
 	self runForText: ''.
@@ -30,7 +31,7 @@ StWorldMenuProcessorTest >> testEmptyQueryShowsResults [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWorldMenuProcessorTest >> testSearchingSaDoesNotIncludeIceberg [
 
 	self runForText: 'sa'.
@@ -38,7 +39,7 @@ StWorldMenuProcessorTest >> testSearchingSaDoesNotIncludeIceberg [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWorldMenuProcessorTest >> testSearchingSaIncludesSaveAndSaveAs [
 
 	self runForText: 'sa'.
@@ -46,14 +47,14 @@ StWorldMenuProcessorTest >> testSearchingSaIncludesSaveAndSaveAs [
 	self assertResultsIncludesMenuEntry: 'Save as...'	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWorldMenuProcessorTest >> testSearchingSettingsFindsTheCorrectEntry [
 
 	self runForText: 'settings'.
 	self assertResultsIncludesMenuEntry: 'Settings'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWorldMenuProcessorTest >> testSearchingVeDoesNotIncludeIceberg [
 
 	self runForText: 've'.
@@ -61,7 +62,7 @@ StWorldMenuProcessorTest >> testSearchingVeDoesNotIncludeIceberg [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StWorldMenuProcessorTest >> testSearchingVeIncludesSaveAndSaveAs [
 
 	self runForText: 'Ve'.
diff --git a/src/NewTools-Spotter-Processors-Tests/package.st b/src/NewTools-Spotter-Processors-Tests/package.st
index 02d0d30b4..ad37f1e24 100644
--- a/src/NewTools-Spotter-Processors-Tests/package.st
+++ b/src/NewTools-Spotter-Processors-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Spotter-Processors-Tests' }
+Package { #name : 'NewTools-Spotter-Processors-Tests' }
diff --git a/src/NewTools-Spotter-Processors/ManifestNewToolsSpotterProcessors.class.st b/src/NewTools-Spotter-Processors/ManifestNewToolsSpotterProcessors.class.st
index cf826080b..ee93f068b 100644
--- a/src/NewTools-Spotter-Processors/ManifestNewToolsSpotterProcessors.class.st
+++ b/src/NewTools-Spotter-Processors/ManifestNewToolsSpotterProcessors.class.st
@@ -2,12 +2,14 @@
 I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser
 "
 Class {
-	#name : #ManifestNewToolsSpotterProcessors,
-	#superclass : #PackageManifest,
-	#category : #'NewTools-Spotter-Processors-Manifest'
+	#name : 'ManifestNewToolsSpotterProcessors',
+	#superclass : 'PackageManifest',
+	#category : 'NewTools-Spotter-Processors-Manifest',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Manifest'
 }
 
-{ #category : #'code-critics' }
+{ #category : 'code-critics' }
 ManifestNewToolsSpotterProcessors class >> ruleReClassNotReferencedRuleV1FalsePositive [
 	^ #(#(#(#RGPackageDefinition #(#'NewTools-Spotter-Processors')) #'2020-03-26T18:37:51.234976+01:00') )
 ]
diff --git a/src/NewTools-Spotter-Processors/MenuItemMorph.extension.st b/src/NewTools-Spotter-Processors/MenuItemMorph.extension.st
index 3604d8877..02f0bf10c 100644
--- a/src/NewTools-Spotter-Processors/MenuItemMorph.extension.st
+++ b/src/NewTools-Spotter-Processors/MenuItemMorph.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #MenuItemMorph }
+Extension { #name : 'MenuItemMorph' }
 
-{ #category : #'*NewTools-Spotter-Processors' }
+{ #category : '*NewTools-Spotter-Processors' }
 MenuItemMorph >> withAllLeafItemsDo: aBlockClosure [
 
 	self subMenu ifNil: [ ^ aBlockClosure cull: self ].
diff --git a/src/NewTools-Spotter-Processors/MenuMorph.extension.st b/src/NewTools-Spotter-Processors/MenuMorph.extension.st
index 11de70efe..8904c9db4 100644
--- a/src/NewTools-Spotter-Processors/MenuMorph.extension.st
+++ b/src/NewTools-Spotter-Processors/MenuMorph.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #MenuMorph }
+Extension { #name : 'MenuMorph' }
 
-{ #category : #'*NewTools-Spotter-Processors' }
+{ #category : '*NewTools-Spotter-Processors' }
 MenuMorph >> withAllLeafItemsDo: aBlockClosure [ 
 	
 	self items do: [:anItem | anItem withAllLeafItemsDo: aBlockClosure]
diff --git a/src/NewTools-Spotter-Processors/StAbstractStringFilter.class.st b/src/NewTools-Spotter-Processors/StAbstractStringFilter.class.st
index d3cfc13f4..431dea485 100644
--- a/src/NewTools-Spotter-Processors/StAbstractStringFilter.class.st
+++ b/src/NewTools-Spotter-Processors/StAbstractStringFilter.class.st
@@ -7,24 +7,26 @@ If the filter requires a full reset, I reset myself and the inner one.
 My subclasses implements #criterium: to change how the strings are compared.
 "
 Class {
-	#name : #StAbstractStringFilter,
-	#superclass : #StIteratorDecorator,
+	#name : 'StAbstractStringFilter',
+	#superclass : 'StIteratorDecorator',
 	#instVars : [
 		'returnedIndex',
 		'originalUnwrapped',
 		'results',
 		'filteringText'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StAbstractStringFilter class >> isAbstract [
 
 	^ self == StAbstractStringFilter
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StAbstractStringFilter class >> on: aStCombinator with: aString [
 
 	^ self new
@@ -32,20 +34,20 @@ StAbstractStringFilter class >> on: aStCombinator with: aString [
 		filteringText: aString
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StAbstractStringFilter >> atEnd [
 
 	^ (returnedIndex = results size) and: [ inner atEnd ]
 ]
 
-{ #category : #protected }
+{ #category : 'protected' }
 StAbstractStringFilter >> criterium: aString [
 
 	self subclassResponsibility 
 
 ]
 
-{ #category : #protected }
+{ #category : 'protected' }
 StAbstractStringFilter >> doReset [
 
 	originalUnwrapped reset.
@@ -53,7 +55,7 @@ StAbstractStringFilter >> doReset [
 	results := OrderedCollection new
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StAbstractStringFilter >> filteringText: aString [
 
 	inner := originalUnwrapped select: [ :e | self criterium: e].
@@ -69,7 +71,7 @@ StAbstractStringFilter >> filteringText: aString [
 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StAbstractStringFilter >> initialize [
 
 	filteringText := ''.
@@ -77,7 +79,7 @@ StAbstractStringFilter >> initialize [
 	returnedIndex := ''.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StAbstractStringFilter >> next [
 
 	| nextOne |
@@ -98,12 +100,12 @@ StAbstractStringFilter >> next [
 	^ nextOne
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StAbstractStringFilter >> originalUnwrapped [
 	^ originalUnwrapped
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StAbstractStringFilter >> originalUnwrapped: anObject [
 	originalUnwrapped := anObject
 ]
diff --git a/src/NewTools-Spotter-Processors/StBeginsWithFilter.class.st b/src/NewTools-Spotter-Processors/StBeginsWithFilter.class.st
index f7e3bd5eb..392dd2339 100644
--- a/src/NewTools-Spotter-Processors/StBeginsWithFilter.class.st
+++ b/src/NewTools-Spotter-Processors/StBeginsWithFilter.class.st
@@ -2,18 +2,20 @@
 I implement a simple beginsWith: string filter.
 "
 Class {
-	#name : #StBeginsWithFilter,
-	#superclass : #StAbstractStringFilter,
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#name : 'StBeginsWithFilter',
+	#superclass : 'StAbstractStringFilter',
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StBeginsWithFilter >> beginsWithFilter: aString [
 
 	self filteringText: aString
 ]
 
-{ #category : #protected }
+{ #category : 'protected' }
 StBeginsWithFilter >> criterium: aValue [
 
 	^ aValue asString asLowercase beginsWith: filteringText asLowercase
diff --git a/src/NewTools-Spotter-Processors/StCaseSelectorIterator.class.st b/src/NewTools-Spotter-Processors/StCaseSelectorIterator.class.st
index ca6224d00..041dcd9ec 100644
--- a/src/NewTools-Spotter-Processors/StCaseSelectorIterator.class.st
+++ b/src/NewTools-Spotter-Processors/StCaseSelectorIterator.class.st
@@ -8,23 +8,25 @@ If the text starts with an uppercase letter, I will iterate the values first fro
 
 "
 Class {
-	#name : #StCaseSelectorIterator,
-	#superclass : #StIteratorDecorator,
+	#name : 'StCaseSelectorIterator',
+	#superclass : 'StIteratorDecorator',
 	#instVars : [
 		'lowercaseIterator',
 		'uppercaseIterator'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #protected }
+{ #category : 'protected' }
 StCaseSelectorIterator >> doReset [
 
 	lowercaseIterator reset.
 	uppercaseIterator reset.
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StCaseSelectorIterator >> filteringText: aString [
 	aString
 		ifEmpty: [ inner := lowercaseIterator.
@@ -35,22 +37,22 @@ StCaseSelectorIterator >> filteringText: aString [
 		ifFalse: [ uppercaseIterator , lowercaseIterator ].
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StCaseSelectorIterator >> lowercaseIterator [
 	^ lowercaseIterator
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StCaseSelectorIterator >> lowercaseIterator: anObject [
 	lowercaseIterator := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StCaseSelectorIterator >> uppercaseIterator [
 	^ uppercaseIterator
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StCaseSelectorIterator >> uppercaseIterator: anObject [
 	uppercaseIterator := anObject
 ]
diff --git a/src/NewTools-Spotter-Processors/StClassEntry.class.st b/src/NewTools-Spotter-Processors/StClassEntry.class.st
index 7354887e6..cba6cf4d9 100644
--- a/src/NewTools-Spotter-Processors/StClassEntry.class.st
+++ b/src/NewTools-Spotter-Processors/StClassEntry.class.st
@@ -2,23 +2,25 @@
 I wrap a Class or Trait entry, to modify its behavior if required for the class
 "
 Class {
-	#name : #StClassEntry,
-	#superclass : #StEntry,
-	#category : #'NewTools-Spotter-Processors-Entries'
+	#name : 'StClassEntry',
+	#superclass : 'StEntry',
+	#category : 'NewTools-Spotter-Processors-Entries',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Entries'
 }
 
-{ #category : #converting }
+{ #category : 'converting' }
 StClassEntry >> asString [
 
 	^ content name
 ]
 
-{ #category : #evaluating }
+{ #category : 'evaluating' }
 StClassEntry >> doEvaluate [
 	content browse
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StClassEntry >> iconName [
 
 	^ content systemIconName
diff --git a/src/NewTools-Spotter-Processors/StClassIterator.class.st b/src/NewTools-Spotter-Processors/StClassIterator.class.st
index c1bee4801..025a9b76e 100644
--- a/src/NewTools-Spotter-Processors/StClassIterator.class.st
+++ b/src/NewTools-Spotter-Processors/StClassIterator.class.st
@@ -3,12 +3,14 @@ I implement an iteration over all the classes in the system.
 
 "
 Class {
-	#name : #StClassIterator,
-	#superclass : #StGenericGenerator,
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#name : 'StClassIterator',
+	#superclass : 'StGenericGenerator',
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #enumerating }
+{ #category : 'enumerating' }
 StClassIterator >> elementsDo: aValuable [
 
 	SystemNavigation default allBehaviorsDo: aValuable
diff --git a/src/NewTools-Spotter-Processors/StClassProcessor.class.st b/src/NewTools-Spotter-Processors/StClassProcessor.class.st
index c7a3972f9..fd42eabbd 100644
--- a/src/NewTools-Spotter-Processors/StClassProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StClassProcessor.class.st
@@ -2,37 +2,39 @@
 I am simple processor that iterates on the classes
 "
 Class {
-	#name : #StClassProcessor,
-	#superclass : #StSpotterProcessor,
-	#category : #'NewTools-Spotter-Processors-Processors'
+	#name : 'StClassProcessor',
+	#superclass : 'StSpotterProcessor',
+	#category : 'NewTools-Spotter-Processors-Processors',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Processors'
 }
 
-{ #category : #'default-settings' }
+{ #category : 'default-settings' }
 StClassProcessor class >> defaultEnabled [
 
 	^ false
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StClassProcessor class >> hideInSettings [
 
 	"I am hidden because the implementation in the unified processor is richer"
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StClassProcessor class >> order [
 	
 	^ 100
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StClassProcessor class >> title [
 
 	^ 'Classes'
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StClassProcessor >> newTextFilteringSource [
 
 	^ StSourceFactory current classesSubstringSource
diff --git a/src/NewTools-Spotter-Processors/StClassWithSelectorWordFilter.class.st b/src/NewTools-Spotter-Processors/StClassWithSelectorWordFilter.class.st
index 5f96690b8..1127afa6e 100644
--- a/src/NewTools-Spotter-Processors/StClassWithSelectorWordFilter.class.st
+++ b/src/NewTools-Spotter-Processors/StClassWithSelectorWordFilter.class.st
@@ -1,13 +1,15 @@
 Class {
-	#name : #StClassWithSelectorWordFilter,
-	#superclass : #StWordsAwareFilter,
+	#name : 'StClassWithSelectorWordFilter',
+	#superclass : 'StWordsAwareFilter',
 	#instVars : [
 		'className'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StClassWithSelectorWordFilter >> additionalFilter: aString firstWord: firstWord otherWords: otherWords on: anEntry [
 
 	^ anEntry content methodClass name = className
@@ -15,7 +17,7 @@ StClassWithSelectorWordFilter >> additionalFilter: aString firstWord: firstWord
 				allSatisfy: [ :otherW | anEntry asString asLowercase includesSubstring: otherW ] ]
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StClassWithSelectorWordFilter >> splitWords: aString [
 
 	| splitted message |
diff --git a/src/NewTools-Spotter-Processors/StCollectionBasedProcessor.class.st b/src/NewTools-Spotter-Processors/StCollectionBasedProcessor.class.st
index a59fea3f8..3b966e1dc 100644
--- a/src/NewTools-Spotter-Processors/StCollectionBasedProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StCollectionBasedProcessor.class.st
@@ -2,30 +2,32 @@
 I am an abstract processor that is used when the results collection already exists or this is really cheap to calculate.
 "
 Class {
-	#name : #StCollectionBasedProcessor,
-	#superclass : #StSpotterProcessor,
-	#category : #'NewTools-Spotter-Processors-Processors'
+	#name : 'StCollectionBasedProcessor',
+	#superclass : 'StSpotterProcessor',
+	#category : 'NewTools-Spotter-Processors-Processors',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Processors'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StCollectionBasedProcessor class >> isAbstract [ 
 
 	^ self = StCollectionBasedProcessor 
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StCollectionBasedProcessor >> collection [
 
 	^ self subclassResponsibility 
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StCollectionBasedProcessor >> newEntryOn: anElement [
 
 	^ self subclassResponsibility 
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StCollectionBasedProcessor >> newTextFilteringSource [
 
 	^ ((StCollectionIterator on: self collection) 
diff --git a/src/NewTools-Spotter-Processors/StCollectionIterator.class.st b/src/NewTools-Spotter-Processors/StCollectionIterator.class.st
index 1dccc48ce..8c6f32bf4 100644
--- a/src/NewTools-Spotter-Processors/StCollectionIterator.class.st
+++ b/src/NewTools-Spotter-Processors/StCollectionIterator.class.st
@@ -2,15 +2,17 @@
 I wrap an existing collection and expose it as a iterator
 "
 Class {
-	#name : #StCollectionIterator,
-	#superclass : #StGenericGenerator,
+	#name : 'StCollectionIterator',
+	#superclass : 'StGenericGenerator',
 	#instVars : [
 		'collection'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StCollectionIterator class >> on: aSequenceableCollection [
 
 	^ self basicNew
@@ -19,17 +21,17 @@ StCollectionIterator class >> on: aSequenceableCollection [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StCollectionIterator >> collection [
 	^ collection
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StCollectionIterator >> collection: anObject [
 	collection := anObject
 ]
 
-{ #category : #enumerating }
+{ #category : 'enumerating' }
 StCollectionIterator >> elementsDo: aValuable [
 
 	collection do: aValuable 
diff --git a/src/NewTools-Spotter-Processors/StDefaultSourceFactory.class.st b/src/NewTools-Spotter-Processors/StDefaultSourceFactory.class.st
index eeabdcdb5..a0bb19eb9 100644
--- a/src/NewTools-Spotter-Processors/StDefaultSourceFactory.class.st
+++ b/src/NewTools-Spotter-Processors/StDefaultSourceFactory.class.st
@@ -3,46 +3,48 @@ I represent the creation of sources without indexes.
 
 "
 Class {
-	#name : #StDefaultSourceFactory,
-	#superclass : #StSourceFactory,
-	#category : #'NewTools-Spotter-Processors-Processors'
+	#name : 'StDefaultSourceFactory',
+	#superclass : 'StSourceFactory',
+	#category : 'NewTools-Spotter-Processors-Processors',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Processors'
 }
 
-{ #category : #'detecting implementations' }
+{ #category : 'detecting implementations' }
 StDefaultSourceFactory class >> isAvailable [ 
 
 	"I am always available, I am the default implementation"
 	^ true
 ]
 
-{ #category : #'detecting implementations' }
+{ #category : 'detecting implementations' }
 StDefaultSourceFactory class >> priority [ 
 	
 	"I have a lower priority, because I don't use any fancy scheme"
 	^ 0 
 ]
 
-{ #category : #'sources - classes' }
+{ #category : 'sources - classes' }
 StDefaultSourceFactory >> classesBeginsWithSource [
 
 	^ ((StClassIterator new select: [ :e | e isMeta not ])
 		collect: [ :e | StClassEntry on: e ]) asBeginsWithFilter
 ]
 
-{ #category : #'sources - classes' }
+{ #category : 'sources - classes' }
 StDefaultSourceFactory >> classesSubstringSource [
 
 	^ ((StClassIterator new select: [ :e | e isMeta not ])
 		collect: [ :e | StClassEntry on: e ]) asSubstringFilter
 ]
 
-{ #category : #'sources - implementors' }
+{ #category : 'sources - implementors' }
 StDefaultSourceFactory >> implementorsBeginsWithSource [
 
 	^ (StImplementorsIterator new collect: [ :e | StMethodEntry on: e ]) asBeginsWithFilter
 ]
 
-{ #category : #'sources - implementors' }
+{ #category : 'sources - implementors' }
 StDefaultSourceFactory >> implementorsSubstringSource [
 
 	^ (StImplementorsIterator new collect: [ :e | StMethodEntry on: e ]) asSubstringFilter
diff --git a/src/NewTools-Spotter-Processors/StEntry.class.st b/src/NewTools-Spotter-Processors/StEntry.class.st
index 5e73f7cb2..695ff5f53 100644
--- a/src/NewTools-Spotter-Processors/StEntry.class.st
+++ b/src/NewTools-Spotter-Processors/StEntry.class.st
@@ -5,21 +5,23 @@ As the processor returns different elements I add the behaviour required to show
 Also, I redirect the messages that should be answer by my content
 "
 Class {
-	#name : #StEntry,
-	#superclass : #Object,
+	#name : 'StEntry',
+	#superclass : 'Object',
 	#instVars : [
 		'content'
 	],
-	#category : #'NewTools-Spotter-Processors-Entries'
+	#category : 'NewTools-Spotter-Processors-Entries',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Entries'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StEntry class >> isAbstract [ 
 
 	^ self == StEntry
 ]
 
-{ #category : #wrapping }
+{ #category : 'wrapping' }
 StEntry class >> on: aValue [
 	
 	^ self new
@@ -27,78 +29,78 @@ StEntry class >> on: aValue [
 		yourself
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StEntry >> = anEntry [
 
 	^ self species = anEntry species
 		and: [ anEntry content = self content ]
 ]
 
-{ #category : #converting }
+{ #category : 'converting' }
 StEntry >> asString [ 
 
 	^ self subclassResponsibility 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StEntry >> content [
 	^ content
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StEntry >> content: anObject [
 	content := anObject
 ]
 
-{ #category : #'spotter-extensions' }
+{ #category : 'spotter-extensions' }
 StEntry >> displayString [
 
 	^ self asString
 ]
 
-{ #category : #evaluating }
+{ #category : 'evaluating' }
 StEntry >> doEvaluate [ 
 
 	self subclassResponsibility 
 ]
 
-{ #category : #evaluating }
+{ #category : 'evaluating' }
 StEntry >> evaluateFor: aSpotter [ 
 
 	self doEvaluate
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StEntry >> hash [
 
 	^ content hash
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StEntry >> iconName [
 	
 	^ self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StEntry >> iconOn: anIconProvider [
 
 	^ anIconProvider iconNamed: self iconName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StEntry >> label [
 
 	^ self asString
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StEntry >> matchesText: aString [
 
 	^ self asString = aString
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StEntry >> printOn: aStream [
 
 	super printOn: aStream.	
@@ -108,7 +110,7 @@ StEntry >> printOn: aStream [
 		<< ' )'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StEntry >> spotterPreview [
 
 	^ (content spotterPreview: SpPresenterBuilder new)
@@ -116,7 +118,7 @@ StEntry >> spotterPreview [
 		yourself
 ]
 
-{ #category : #'spotter-extensions' }
+{ #category : 'spotter-extensions' }
 StEntry >> stSpotterProcessorsFor: aSpotterStep [
 
 	^ content stSpotterProcessorsFor: aSpotterStep
diff --git a/src/NewTools-Spotter-Processors/StFilter.class.st b/src/NewTools-Spotter-Processors/StFilter.class.st
index 86afabcac..9877aff90 100644
--- a/src/NewTools-Spotter-Processors/StFilter.class.st
+++ b/src/NewTools-Spotter-Processors/StFilter.class.st
@@ -4,18 +4,20 @@ I apply the block and filter the elements returned by myself.
 
 "
 Class {
-	#name : #StFilter,
-	#superclass : #StIteratorBlockDecorator,
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#name : 'StFilter',
+	#superclass : 'StIteratorBlockDecorator',
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFilter >> filter: aValue [
 
 	^ aBlock value: aValue
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFilter >> next [
 
 	| value |
diff --git a/src/NewTools-Spotter-Processors/StGeneratorBlockIterator.class.st b/src/NewTools-Spotter-Processors/StGeneratorBlockIterator.class.st
index fa7c0210c..3aa4a4311 100644
--- a/src/NewTools-Spotter-Processors/StGeneratorBlockIterator.class.st
+++ b/src/NewTools-Spotter-Processors/StGeneratorBlockIterator.class.st
@@ -2,15 +2,17 @@
 I wrap a block and expose it as an iterator
 "
 Class {
-	#name : #StGeneratorBlockIterator,
-	#superclass : #StGenericGenerator,
+	#name : 'StGeneratorBlockIterator',
+	#superclass : 'StGenericGenerator',
 	#instVars : [
 		'block'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StGeneratorBlockIterator class >> on: aBlock [
 
 	^ self basicNew
@@ -19,17 +21,17 @@ StGeneratorBlockIterator class >> on: aBlock [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StGeneratorBlockIterator >> block [
 	^ block
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StGeneratorBlockIterator >> block: anObject [
 	block := anObject
 ]
 
-{ #category : #enumerating }
+{ #category : 'enumerating' }
 StGeneratorBlockIterator >> elementsDo: aValuable [
 
 	block value: aValuable
diff --git a/src/NewTools-Spotter-Processors/StGenericGenerator.class.st b/src/NewTools-Spotter-Processors/StGenericGenerator.class.st
index 904dbf781..34f5c3950 100644
--- a/src/NewTools-Spotter-Processors/StGenericGenerator.class.st
+++ b/src/NewTools-Spotter-Processors/StGenericGenerator.class.st
@@ -18,51 +18,53 @@ elementsDo: aValuable
 	SystemNavigation default allBehaviorsDo: aValuable
 "
 Class {
-	#name : #StGenericGenerator,
-	#superclass : #StIterator,
+	#name : 'StGenericGenerator',
+	#superclass : 'StIterator',
 	#instVars : [
 		'generator'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StGenericGenerator class >> isAbstract [
 
 	^ self == StGenericGenerator
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StGenericGenerator >> atEnd [ 
 
 	^ generator atEnd
 ]
 
-{ #category : #protected }
+{ #category : 'protected' }
 StGenericGenerator >> doReset [
 	generator := Generator on: [ :aGenerator | 
 		self elementsDo: [ :each | aGenerator yield: each ] ]
 ]
 
-{ #category : #enumerating }
+{ #category : 'enumerating' }
 StGenericGenerator >> elementsDo: aValuable [
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StGenericGenerator >> initialize [
 	super initialize.
 	self reset
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StGenericGenerator >> next [
 
 	^ generator next
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StGenericGenerator >> next: aQuantity [
 
 	^ generator next: aQuantity
diff --git a/src/NewTools-Spotter-Processors/StHistoryProcessor.class.st b/src/NewTools-Spotter-Processors/StHistoryProcessor.class.st
index 886316795..469e38e5f 100644
--- a/src/NewTools-Spotter-Processors/StHistoryProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StHistoryProcessor.class.st
@@ -2,42 +2,44 @@
 I am a processor that shows all the entries in the spotter history.
 "
 Class {
-	#name : #StHistoryProcessor,
-	#superclass : #StCollectionBasedProcessor,
-	#category : #'NewTools-Spotter-Processors-Processors'
+	#name : 'StHistoryProcessor',
+	#superclass : 'StCollectionBasedProcessor',
+	#category : 'NewTools-Spotter-Processors-Processors',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Processors'
 }
 
-{ #category : #'default-settings' }
+{ #category : 'default-settings' }
 StHistoryProcessor class >> defaultEnabled [
 
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHistoryProcessor class >> order [
 	
 	^ 80
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StHistoryProcessor class >> title [
 
 	^ 'History'
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StHistoryProcessor >> collection [
 
 	^ StSpotter history reject: [ :each | each isNil ]
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StHistoryProcessor >> newEntryOn: anElement [
 
 	^ anElement
 ]
 
-{ #category : #configuration }
+{ #category : 'configuration' }
 StHistoryProcessor >> showForEmptyQuery [
 
 	^ true
diff --git a/src/NewTools-Spotter-Processors/StImplementorsIterator.class.st b/src/NewTools-Spotter-Processors/StImplementorsIterator.class.st
index 4ba41e3b1..6a90ac6b6 100644
--- a/src/NewTools-Spotter-Processors/StImplementorsIterator.class.st
+++ b/src/NewTools-Spotter-Processors/StImplementorsIterator.class.st
@@ -2,12 +2,14 @@
 I implement an iterator over all the implementors in the system
 "
 Class {
-	#name : #StImplementorsIterator,
-	#superclass : #StGenericGenerator,
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#name : 'StImplementorsIterator',
+	#superclass : 'StGenericGenerator',
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #enumerating }
+{ #category : 'enumerating' }
 StImplementorsIterator >> elementsDo: aValuable [
 
 	SystemNavigation default
diff --git a/src/NewTools-Spotter-Processors/StImplementorsProcessor.class.st b/src/NewTools-Spotter-Processors/StImplementorsProcessor.class.st
index e79f795fa..03bffb00d 100644
--- a/src/NewTools-Spotter-Processors/StImplementorsProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StImplementorsProcessor.class.st
@@ -2,37 +2,39 @@
 I am simple processor that iterates on the implementors
 "
 Class {
-	#name : #StImplementorsProcessor,
-	#superclass : #StSpotterProcessor,
-	#category : #'NewTools-Spotter-Processors-Processors'
+	#name : 'StImplementorsProcessor',
+	#superclass : 'StSpotterProcessor',
+	#category : 'NewTools-Spotter-Processors-Processors',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Processors'
 }
 
-{ #category : #'default-settings' }
+{ #category : 'default-settings' }
 StImplementorsProcessor class >> defaultEnabled [
 
 	^ false
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StImplementorsProcessor class >> hideInSettings [
 
 	"I am hidden because the implementation in the unified processor is richer"
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StImplementorsProcessor class >> order [
 	
 	^ 100
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StImplementorsProcessor class >> title [
 
 	^ 'Implementors'
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StImplementorsProcessor >> newTextFilteringSource [
 
 	^ StSourceFactory current implementorsSubstringSource
diff --git a/src/NewTools-Spotter-Processors/StIterator.class.st b/src/NewTools-Spotter-Processors/StIterator.class.st
index 59ff1b444..e70aee5f4 100644
--- a/src/NewTools-Spotter-Processors/StIterator.class.st
+++ b/src/NewTools-Spotter-Processors/StIterator.class.st
@@ -21,75 +21,77 @@ Create an iterator that allows to filter by a string, comparing with substring:,
 Creates an itearator that returns no duplicates.
 "
 Class {
-	#name : #StIterator,
-	#superclass : #Object,
+	#name : 'StIterator',
+	#superclass : 'Object',
 	#instVars : [
 		'onReset'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StIterator class >> isAbstract [
 
 	^ self == StIterator
 ]
 
-{ #category : #sequencing }
+{ #category : 'sequencing' }
 StIterator >> , aStGeneratorIterator [ 
 	
 	^ StSequenceIterator with: { self. aStGeneratorIterator }
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StIterator >> asBeginsWithFilter [
 	
 	^ self beginsWithFilter: ''
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StIterator >> asSubstringFilter [
 	
 	^ self substringFilter: ''
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StIterator >> asWithoutDuplicates [
 	
 	^ StWithoutDuplicatesDecorator on: self
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StIterator >> atEnd [ 
 
 	^ self subclassResponsibility 
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StIterator >> beginsWithFilter: aString [ 
 	
 	^ StBeginsWithFilter on: self with: aString
 ]
 
-{ #category : #transforming }
+{ #category : 'transforming' }
 StIterator >> collect: aBlockClosure [ 
 	
 	^ StTransformation on: self with: aBlockClosure
 ]
 
-{ #category : #protected }
+{ #category : 'protected' }
 StIterator >> doReset [
 	
 	^ self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StIterator >> next [
 
 	self subclassResponsibility 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StIterator >> next: aQuantity [
 
 	^ OrderedCollection streamContents: [ :stream | | total last |
@@ -101,32 +103,32 @@ StIterator >> next: aQuantity [
 				doWhileTrue: [ total < aQuantity and: [ last notNil ] ] ]
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StIterator >> onReset: aValuable [
 
 	onReset := aValuable
 ]
 
-{ #category : #reseting }
+{ #category : 'reseting' }
 StIterator >> reset [
 
 	self doReset.
 	onReset ifNotNil: [ onReset value ]
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StIterator >> select: aBlockClosure [ 
 	
 	^ StFilter on: self with: aBlockClosure 
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StIterator >> substringFilter: aString [ 
 	
 	^ StSubStringFilter on: self with: aString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StIterator >> upToEnd [
 
 	^ OrderedCollection
diff --git a/src/NewTools-Spotter-Processors/StIteratorBlockDecorator.class.st b/src/NewTools-Spotter-Processors/StIteratorBlockDecorator.class.st
index f3fdcd4ac..f12e07da3 100644
--- a/src/NewTools-Spotter-Processors/StIteratorBlockDecorator.class.st
+++ b/src/NewTools-Spotter-Processors/StIteratorBlockDecorator.class.st
@@ -2,21 +2,23 @@
 I implement a simple block decorator, I am a abstract class that have a block.
 "
 Class {
-	#name : #StIteratorBlockDecorator,
-	#superclass : #StIteratorDecorator,
+	#name : 'StIteratorBlockDecorator',
+	#superclass : 'StIteratorDecorator',
 	#instVars : [
 		'aBlock'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StIteratorBlockDecorator class >> isAbstract [
 
 	^ self == StIteratorBlockDecorator
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StIteratorBlockDecorator class >> on: aStGeneratorIterator with: aBlockClosure [ 
 	
 	^ self new
@@ -25,7 +27,7 @@ StIteratorBlockDecorator class >> on: aStGeneratorIterator with: aBlockClosure [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StIteratorBlockDecorator >> block: aBlockClosure [
 
 	aBlock := aBlockClosure
diff --git a/src/NewTools-Spotter-Processors/StIteratorDecorator.class.st b/src/NewTools-Spotter-Processors/StIteratorDecorator.class.st
index 4c835a576..deeeaeef0 100644
--- a/src/NewTools-Spotter-Processors/StIteratorDecorator.class.st
+++ b/src/NewTools-Spotter-Processors/StIteratorDecorator.class.st
@@ -4,38 +4,40 @@ I have an iterator in the inner instance variable and all the messages are redir
 My subclasses can override the required behaviour.
 "
 Class {
-	#name : #StIteratorDecorator,
-	#superclass : #StIterator,
+	#name : 'StIteratorDecorator',
+	#superclass : 'StIterator',
 	#instVars : [
 		'inner'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StIteratorDecorator class >> isAbstract [
 
 	^ self == StIteratorDecorator
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StIteratorDecorator >> atEnd [ 
 
 	^ inner atEnd
 ]
 
-{ #category : #protected }
+{ #category : 'protected' }
 StIteratorDecorator >> doReset [ 
 	
 	inner reset
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StIteratorDecorator >> inner: anObject [
 	inner := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StIteratorDecorator >> next [
 
 	^ inner next
diff --git a/src/NewTools-Spotter-Processors/StMethodEntry.class.st b/src/NewTools-Spotter-Processors/StMethodEntry.class.st
index 4fbfdb680..7b5622c00 100644
--- a/src/NewTools-Spotter-Processors/StMethodEntry.class.st
+++ b/src/NewTools-Spotter-Processors/StMethodEntry.class.st
@@ -2,30 +2,32 @@
 I wrap a CompiledMethod, to modify its behavior if required for the class
 "
 Class {
-	#name : #StMethodEntry,
-	#superclass : #StEntry,
-	#category : #'NewTools-Spotter-Processors-Entries'
+	#name : 'StMethodEntry',
+	#superclass : 'StEntry',
+	#category : 'NewTools-Spotter-Processors-Entries',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Entries'
 }
 
-{ #category : #converting }
+{ #category : 'converting' }
 StMethodEntry >> asString [
 
 	^ content selector
 ]
 
-{ #category : #evaluating }
+{ #category : 'evaluating' }
 StMethodEntry >> doEvaluate [
 
 	^ content browse
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StMethodEntry >> iconName [
 
 	^ content systemIconName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StMethodEntry >> label [
 
 	^ content printString
diff --git a/src/NewTools-Spotter-Processors/StPackageEntry.class.st b/src/NewTools-Spotter-Processors/StPackageEntry.class.st
index 4b8e78034..76d27ee56 100644
--- a/src/NewTools-Spotter-Processors/StPackageEntry.class.st
+++ b/src/NewTools-Spotter-Processors/StPackageEntry.class.st
@@ -2,24 +2,26 @@
 I wrap a RPackage entry, to modify its behavior if required for the class
 "
 Class {
-	#name : #StPackageEntry,
-	#superclass : #StEntry,
-	#category : #'NewTools-Spotter-Processors-Entries'
+	#name : 'StPackageEntry',
+	#superclass : 'StEntry',
+	#category : 'NewTools-Spotter-Processors-Entries',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Entries'
 }
 
-{ #category : #converting }
+{ #category : 'converting' }
 StPackageEntry >> asString [
 
 	^ content name
 ]
 
-{ #category : #evaluating }
+{ #category : 'evaluating' }
 StPackageEntry >> doEvaluate [
 
 	content browse
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPackageEntry >> iconName [
 
 	^ #package
diff --git a/src/NewTools-Spotter-Processors/StPackageIterator.class.st b/src/NewTools-Spotter-Processors/StPackageIterator.class.st
index a7bdec151..7ce1e2a20 100644
--- a/src/NewTools-Spotter-Processors/StPackageIterator.class.st
+++ b/src/NewTools-Spotter-Processors/StPackageIterator.class.st
@@ -2,12 +2,14 @@
 I implement an iterator over all the packages in the system
 "
 Class {
-	#name : #StPackageIterator,
-	#superclass : #StGenericGenerator,
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#name : 'StPackageIterator',
+	#superclass : 'StGenericGenerator',
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #enumerating }
+{ #category : 'enumerating' }
 StPackageIterator >> elementsDo: aValuable [
 
 	RPackageOrganizer default packagesDo: aValuable
diff --git a/src/NewTools-Spotter-Processors/StPackageProcessor.class.st b/src/NewTools-Spotter-Processors/StPackageProcessor.class.st
index 2574cf2ab..2b7d2edd0 100644
--- a/src/NewTools-Spotter-Processors/StPackageProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StPackageProcessor.class.st
@@ -2,36 +2,38 @@
 I am simple processor that iterates on the packages in the system
 "
 Class {
-	#name : #StPackageProcessor,
-	#superclass : #StSpotterProcessor,
-	#category : #'NewTools-Spotter-Processors-Processors'
+	#name : 'StPackageProcessor',
+	#superclass : 'StSpotterProcessor',
+	#category : 'NewTools-Spotter-Processors-Processors',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Processors'
 }
 
-{ #category : #'default-settings' }
+{ #category : 'default-settings' }
 StPackageProcessor class >> defaultEnabled [
 
 	^ false
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StPackageProcessor class >> hideInSettings [
 
 	"I am hidden because the implementation in the unified processor is richer"
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPackageProcessor class >> order [
 	
 	^ 100
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StPackageProcessor class >> title [
 	^ 'Packages'
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StPackageProcessor >> newTextFilteringSource [
 
 	^ (StPackageIterator new collect: [ :e | StClassEntry on: e ]) asSubstringFilter
diff --git a/src/NewTools-Spotter-Processors/StQuery.class.st b/src/NewTools-Spotter-Processors/StQuery.class.st
index 3e90ed8d4..fbbab1e9a 100644
--- a/src/NewTools-Spotter-Processors/StQuery.class.st
+++ b/src/NewTools-Spotter-Processors/StQuery.class.st
@@ -10,18 +10,20 @@ The processors talk with me to add results to the query, and later show them (#a
 I am also configurable to filter classes, implementors or add another modified.
 "
 Class {
-	#name : #StQuery,
-	#superclass : #Object,
+	#name : 'StQuery',
+	#superclass : 'Object',
 	#instVars : [
 		'query',
 		'spotterContext',
 		'processor',
 		'modifiers'
 	],
-	#category : #'NewTools-Spotter-Processors-Query'
+	#category : 'NewTools-Spotter-Processors-Query',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Query'
 }
 
-{ #category : #results }
+{ #category : 'results' }
 StQuery >> addResult: anEntry [
 
 	spotterContext stream
@@ -29,25 +31,25 @@ StQuery >> addResult: anEntry [
 		withArguments: { anEntry. processor }
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StQuery >> categoriesSelected [
 
 	^ modifiers copy
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StQuery >> hasAnyCategory [
 
 	^ self categoriesSelected notEmpty
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StQuery >> hasCategoryMatching: aSymbol [
 
 	^ self categoriesSelected anySatisfy: [ :each | each asLowercase beginsWith: aSymbol ]
 ]
 
-{ #category : #results }
+{ #category : 'results' }
 StQuery >> informAllResultAmount: anInteger [ 
 
 	spotterContext stream
@@ -56,7 +58,7 @@ StQuery >> informAllResultAmount: anInteger [
 	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StQuery >> initialize [
 
 	super initialize.
@@ -64,31 +66,31 @@ StQuery >> initialize [
 	query:= ''.
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StQuery >> isSearchEmpty [
 
 	^ query isEmpty
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StQuery >> processor [
 
 	^ processor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StQuery >> processor: aProcessor [
 
 	processor := aProcessor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StQuery >> searchingText [
 	
 	^ query
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StQuery >> textInSearchBar [
 
 	^ String streamContents: [ :stream | 
@@ -96,7 +98,7 @@ StQuery >> textInSearchBar [
 		stream nextPutAll: query ]
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 StQuery >> toggleFilter: filterTag [
 
 	(modifiers includes: filterTag) 
@@ -104,7 +106,7 @@ StQuery >> toggleFilter: filterTag [
 		ifFalse: [ modifiers add: filterTag ]
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StQuery >> updateFromContext: aSpotterContext [
 	| textParts texts |
 
diff --git a/src/NewTools-Spotter-Processors/StSendersIterator.class.st b/src/NewTools-Spotter-Processors/StSendersIterator.class.st
index 2828bfc9a..f8b60fca9 100644
--- a/src/NewTools-Spotter-Processors/StSendersIterator.class.st
+++ b/src/NewTools-Spotter-Processors/StSendersIterator.class.st
@@ -4,22 +4,24 @@ I always receive a filteringText because it does not have any sense to show send
 Also, I lookup all the senders of the complete symbol.
 "
 Class {
-	#name : #StSendersIterator,
-	#superclass : #StGenericGenerator,
+	#name : 'StSendersIterator',
+	#superclass : 'StGenericGenerator',
 	#instVars : [
 		'selector'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #enumerating }
+{ #category : 'enumerating' }
 StSendersIterator >> elementsDo: aValuable [
 
 	selector ifNil: [ ^ self ].
 	^ selector senders do: [ :aMethod | aValuable value: (StMethodEntry on: aMethod )]
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StSendersIterator >> filteringText: aString [
 
 	selector := aString ifEmpty: [ nil] ifNotEmpty: [aString asSymbol].
diff --git a/src/NewTools-Spotter-Processors/StSendersProcessor.class.st b/src/NewTools-Spotter-Processors/StSendersProcessor.class.st
index a6f50f4fc..ce2ec7e57 100644
--- a/src/NewTools-Spotter-Processors/StSendersProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StSendersProcessor.class.st
@@ -3,49 +3,51 @@ I implement the lookup of #Senders and the Meta + n binding.
 
 "
 Class {
-	#name : #StSendersProcessor,
-	#superclass : #StSpotterProcessor,
-	#category : #'NewTools-Spotter-Processors-Processors'
+	#name : 'StSendersProcessor',
+	#superclass : 'StSpotterProcessor',
+	#category : 'NewTools-Spotter-Processors-Processors',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Processors'
 }
 
-{ #category : #'default-settings' }
+{ #category : 'default-settings' }
 StSendersProcessor class >> defaultEnabled [
 
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSendersProcessor class >> order [
 	
 	^ 150
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSendersProcessor class >> title [
 	
 	^ 'Senders'
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSendersProcessor >> askingForSenders [
 
 	^ query hasCategoryMatching: #s
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSendersProcessor >> categoriesIncludes: aCategory [
 
 	^ aCategory asLowercase beginsWith: #s
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StSendersProcessor >> executeQuery [
 
 	self askingForSenders ifFalse: [ ^ self ].
 	^ super executeQuery 
 ]
 
-{ #category : #'key-bindings' }
+{ #category : 'key-bindings' }
 StSendersProcessor >> installKeymappingsOn: aPresenter onExecution: aBlock [
 
 	aPresenter
@@ -55,25 +57,25 @@ StSendersProcessor >> installKeymappingsOn: aPresenter onExecution: aBlock [
 			aBlock cull: self ]
 ]
 
-{ #category : #'spotter-api' }
+{ #category : 'spotter-api' }
 StSendersProcessor >> isRelevantForQuery: aString [ 
 	
 	^ true
 ]
 
-{ #category : #'key-bindings' }
+{ #category : 'key-bindings' }
 StSendersProcessor >> keyBinding [
 
 	^ $n meta
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StSendersProcessor >> newTextFilteringSource [
 
 	^ StSendersIterator new 
 ]
 
-{ #category : #'key-bindings' }
+{ #category : 'key-bindings' }
 StSendersProcessor >> sendersTag [
 		
 	^ #Senders
diff --git a/src/NewTools-Spotter-Processors/StSequenceIterator.class.st b/src/NewTools-Spotter-Processors/StSequenceIterator.class.st
index 35607a394..19deee802 100644
--- a/src/NewTools-Spotter-Processors/StSequenceIterator.class.st
+++ b/src/NewTools-Spotter-Processors/StSequenceIterator.class.st
@@ -3,15 +3,17 @@ I am sequence iterator, I will take all the iterators I have in myself and then
 I iterate first all elements from the first one, and then the elements of the second one, and so on.
 "
 Class {
-	#name : #StSequenceIterator,
-	#superclass : #StIterator,
+	#name : 'StSequenceIterator',
+	#superclass : 'StIterator',
 	#instVars : [
 		'iterators'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSequenceIterator class >> with: aCollection [ 
 	
 	^ self new
@@ -19,25 +21,25 @@ StSequenceIterator class >> with: aCollection [
 		yourself
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSequenceIterator >> atEnd [ 
 
 	^ iterators allSatisfy: [ :e | e atEnd ]
 ]
 
-{ #category : #protected }
+{ #category : 'protected' }
 StSequenceIterator >> doReset [
 
 	^ iterators do: [ :e | e reset ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSequenceIterator >> iterators: aCollection [ 
 
 	iterators := aCollection 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSequenceIterator >> next [
 
 	iterators do: [ :e | e next ifNotNil: [ :aValue | ^ aValue ] ].
diff --git a/src/NewTools-Spotter-Processors/StSourceFactory.class.st b/src/NewTools-Spotter-Processors/StSourceFactory.class.st
index 413d85403..3bbf845c8 100644
--- a/src/NewTools-Spotter-Processors/StSourceFactory.class.st
+++ b/src/NewTools-Spotter-Processors/StSourceFactory.class.st
@@ -3,21 +3,23 @@ I represent the responsibility to create the sources,
 so there could be different strategies to generate the sources, for example with or without indexes.
 "
 Class {
-	#name : #StSourceFactory,
-	#superclass : #Object,
+	#name : 'StSourceFactory',
+	#superclass : 'Object',
 	#classVars : [
 		'Current'
 	],
-	#category : #'NewTools-Spotter-Processors-Processors'
+	#category : 'NewTools-Spotter-Processors-Processors',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Processors'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSourceFactory class >> current [
 
 	^ Current ifNil: [ self defaultSourceFactory ]
 ]
 
-{ #category : #'detecting implementations' }
+{ #category : 'detecting implementations' }
 StSourceFactory class >> defaultSourceFactory [
 
 	| sourceFactoryClass |
@@ -28,49 +30,49 @@ StSourceFactory class >> defaultSourceFactory [
 	^ sourceFactoryClass new
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSourceFactory class >> forTest [
 
 	Current := self new
 ]
 
-{ #category : #'detecting implementations' }
+{ #category : 'detecting implementations' }
 StSourceFactory class >> isAvailable [ 
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #'detecting implementations' }
+{ #category : 'detecting implementations' }
 StSourceFactory class >> priority [ 
 
 	^ self subclassResponsibility 
 ]
 
-{ #category : #'class initialization' }
+{ #category : 'class initialization' }
 StSourceFactory class >> reset [
 
 	Current := nil
 ]
 
-{ #category : #'sources - classes' }
+{ #category : 'sources - classes' }
 StSourceFactory >> classesBeginsWithSource [
 
 	 ^ self subclassResponsibility 
 ]
 
-{ #category : #'sources - classes' }
+{ #category : 'sources - classes' }
 StSourceFactory >> classesSubstringSource [
 
 	 ^ self subclassResponsibility 
 ]
 
-{ #category : #'sources - implementors' }
+{ #category : 'sources - implementors' }
 StSourceFactory >> implementorsBeginsWithSource [
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #'sources - implementors' }
+{ #category : 'sources - implementors' }
 StSourceFactory >> implementorsSubstringSource [
 
 	^ self subclassResponsibility
diff --git a/src/NewTools-Spotter-Processors/StSpotterCandidatesListProcessor.class.st b/src/NewTools-Spotter-Processors/StSpotterCandidatesListProcessor.class.st
index 48edf1d22..f3caf2f96 100644
--- a/src/NewTools-Spotter-Processors/StSpotterCandidatesListProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StSpotterCandidatesListProcessor.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #StSpotterCandidatesListProcessor,
-	#superclass : #StSpotterCandidatesProcessor,
+	#name : 'StSpotterCandidatesListProcessor',
+	#superclass : 'StSpotterCandidatesProcessor',
 	#instVars : [
 		'allCandidatesBlock',
 		'candidatesLimit',
@@ -13,53 +13,54 @@ Class {
 		'sortBlock',
 		'itemIconNameBlock'
 	],
-	#category : #'NewTools-Spotter-Processors'
+	#category : 'NewTools-Spotter-Processors',
+	#package : 'NewTools-Spotter-Processors'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesListProcessor >> actLogic [
 	^ actBlock
 ]
 
-{ #category : #scripting }
+{ #category : 'scripting' }
 StSpotterCandidatesListProcessor >> actLogic: aBlockWithTwoArguments [
 
 	actBlock := aBlockWithTwoArguments
 ]
 
-{ #category : #compatibility }
+{ #category : 'compatibility' }
 StSpotterCandidatesListProcessor >> allCandidates: aBlockWithOneArgument [
 	self items: aBlockWithOneArgument
 ]
 
-{ #category : #compatibility }
+{ #category : 'compatibility' }
 StSpotterCandidatesListProcessor >> candidatesLimit: anInteger [
 	self itemsLimit: anInteger
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesListProcessor >> computeAllItemsIn: aContext [
 
 	^ allCandidatesBlock cull: aContext
 ]
 
-{ #category : #compatibility }
+{ #category : 'compatibility' }
 StSpotterCandidatesListProcessor >> defaultCandidatesLimit [
 	^ self defaultItemsLimit
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterCandidatesListProcessor >> defaultContinueItemsLimit [
 	" Spotter becomes extraordenary slow when rendering too many results. So we set the maximum limit to 100. This is only a temporary solution until we have fixed the problem. Until then no spotter processor will ever generate more then 100 results. "
 	^ 100
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterCandidatesListProcessor >> defaultItemsLimit [
 	^ self class defaultItemsLimit
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesListProcessor >> doFilterInContext: aSpotterContext [
 
 	^ aSpotterContext 
@@ -67,17 +68,17 @@ StSpotterCandidatesListProcessor >> doFilterInContext: aSpotterContext [
 		forProcessor: self
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesListProcessor >> filter [
 	^ filterBlock
 ]
 
-{ #category : #scripting }
+{ #category : 'scripting' }
 StSpotterCandidatesListProcessor >> filter: aGTFilterOrBlockWithOneArgument [
 	filterBlock := aGTFilterOrBlockWithOneArgument 
 ]
 
-{ #category : #scripting }
+{ #category : 'scripting' }
 StSpotterCandidatesListProcessor >> filter: aFilter item: anIterator [ 
 
 	self filter: aFilter.
@@ -85,30 +86,30 @@ StSpotterCandidatesListProcessor >> filter: aFilter item: anIterator [
 	
 ]
 
-{ #category : #compatibility }
+{ #category : 'compatibility' }
 StSpotterCandidatesListProcessor >> filterUsing: aFilter [
 	self filter: aFilter
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterCandidatesListProcessor >> hasDynamicItems [
 
 	^ allCandidatesBlock stHasDynamicItems
 ]
 
-{ #category : #scripting }
+{ #category : 'scripting' }
 StSpotterCandidatesListProcessor >> itemIconName [
 
 	^ itemIconNameBlock
 ]
 
-{ #category : #scripting }
+{ #category : 'scripting' }
 StSpotterCandidatesListProcessor >> itemIconName: aBlock [
 
 	itemIconNameBlock := aBlock
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesListProcessor >> itemIconNameFor: anObject [
 
 	^ itemIconNameBlock 
@@ -116,17 +117,17 @@ StSpotterCandidatesListProcessor >> itemIconNameFor: anObject [
 		ifNil: [ super itemIconNameFor: anObject ] 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesListProcessor >> itemName [
 	^ itemNameBlock
 ]
 
-{ #category : #scripting }
+{ #category : 'scripting' }
 StSpotterCandidatesListProcessor >> itemName: aBlockWithOneArgument [
 	itemNameBlock := aBlockWithOneArgument
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesListProcessor >> itemNameFor: anObject [
 
 	^ itemNameBlock 
@@ -134,32 +135,32 @@ StSpotterCandidatesListProcessor >> itemNameFor: anObject [
 		ifNil: [ super itemNameFor: anObject ] 
 ]
 
-{ #category : #scripting }
+{ #category : 'scripting' }
 StSpotterCandidatesListProcessor >> items: aBlock [
 	allCandidatesBlock := aBlock
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesListProcessor >> itemsLimit [
 	^ candidatesLimit ifNil: [ self defaultItemsLimit ]
 ]
 
-{ #category : #scripting }
+{ #category : 'scripting' }
 StSpotterCandidatesListProcessor >> itemsLimit: anInteger [
 	candidatesLimit := anInteger
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesListProcessor >> keyBinding [
 	^ keyBinding
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesListProcessor >> keyBinding: anObject [
 	keyBinding := anObject
 ]
 
-{ #category : #'scripting - convenience' }
+{ #category : 'scripting - convenience' }
 StSpotterCandidatesListProcessor >> match: aBlockWithTwoArguments [
 
 	self filter: (StFilterBlock new 
@@ -167,62 +168,62 @@ StSpotterCandidatesListProcessor >> match: aBlockWithTwoArguments [
 		yourself)
 ]
 
-{ #category : #'scripting - convenience' }
+{ #category : 'scripting - convenience' }
 StSpotterCandidatesListProcessor >> matchAlike [
 	self filter: StFilterAlike
 ]
 
-{ #category : #'scripting - convenience' }
+{ #category : 'scripting - convenience' }
 StSpotterCandidatesListProcessor >> matchRegex [
 	self filter: StFilterRegex
 ]
 
-{ #category : #'scripting - convenience' }
+{ #category : 'scripting - convenience' }
 StSpotterCandidatesListProcessor >> matchString [
 	self filter: StFilterStringMatch
 ]
 
-{ #category : #'scripting - convenience' }
+{ #category : 'scripting - convenience' }
 StSpotterCandidatesListProcessor >> matchSubstring [
 	self filter: StFilterSubstring
 ]
 
-{ #category : #'scripting - convenience' }
+{ #category : 'scripting - convenience' }
 StSpotterCandidatesListProcessor >> matchSubstrings [
 	self filter: StFilterSubstrings
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesListProcessor >> sort [
 	^ sortBlock
 ]
 
-{ #category : #scripting }
+{ #category : 'scripting' }
 StSpotterCandidatesListProcessor >> sort: aBlockWithTwoArguments [
 	sortBlock := aBlockWithTwoArguments
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesListProcessor >> title [
 	^ title ifNil: [ super title ]
 ]
 
-{ #category : #scripting }
+{ #category : 'scripting' }
 StSpotterCandidatesListProcessor >> title: aString [
 	title := aString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesListProcessor >> wantsToDisplayOnEmptyQuery [
 	^ wantsToDisplayOnEmptyQuery ifNil: [ super wantsToDisplayOnEmptyQuery ]
 ]
 
-{ #category : #scripting }
+{ #category : 'scripting' }
 StSpotterCandidatesListProcessor >> wantsToDisplayOnEmptyQuery: anObject [
 	wantsToDisplayOnEmptyQuery := anObject
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesListProcessor >> withItemsLimit: aLimit do: aBlock [
 	| previousCandidatesLimit |
 	previousCandidatesLimit := candidatesLimit.
diff --git a/src/NewTools-Spotter-Processors/StSpotterCandidatesProcessor.class.st b/src/NewTools-Spotter-Processors/StSpotterCandidatesProcessor.class.st
index 1d70b16f4..0116920f7 100644
--- a/src/NewTools-Spotter-Processors/StSpotterCandidatesProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StSpotterCandidatesProcessor.class.st
@@ -1,54 +1,55 @@
 Class {
-	#name : #StSpotterCandidatesProcessor,
-	#superclass : #StSpotterPragmaBasedProcessor,
+	#name : 'StSpotterCandidatesProcessor',
+	#superclass : 'StSpotterPragmaBasedProcessor',
 	#instVars : [
 		'origin',
 		'allCandidates'
 	],
-	#category : #'NewTools-Spotter-Processors'
+	#category : 'NewTools-Spotter-Processors',
+	#package : 'NewTools-Spotter-Processors'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSpotterCandidatesProcessor class >> on: anObject [
 
 	^ self new origin: anObject
 ]
 
-{ #category : #compatibility }
+{ #category : 'compatibility' }
 StSpotterCandidatesProcessor >> allCandidatesIn: aContext [
 	^ self allItemsIn: aContext
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterCandidatesProcessor >> allItemsIn: aContext [
 
 	^ allCandidates ifNil: [ allCandidates := (self computeAllItemsIn: aContext) copy ].
 ]
 
-{ #category : #compatibility }
+{ #category : 'compatibility' }
 StSpotterCandidatesProcessor >> candidatesLimit [
 	^ self itemsLimit
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesProcessor >> computeAllItemsIn: aContext [
 
 	^ OrderedCollection new
 	
 ]
 
-{ #category : #compatibility }
+{ #category : 'compatibility' }
 StSpotterCandidatesProcessor >> computeCandidatesIn: aContext [
 
 	^ self computeAllItemsIn: aContext
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesProcessor >> continueItemsLimit [
 	^ (self defaultContinueItemsLimit - self itemsLimit) max: 0
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesProcessor >> doFilterInContext: aSpotterContext [
 
 	^ aSpotterContext 
@@ -56,49 +57,49 @@ StSpotterCandidatesProcessor >> doFilterInContext: aSpotterContext [
 		forProcessor: self
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesProcessor >> itemFilterNameFor: anObject [
 	^ self itemNameFor: anObject
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesProcessor >> itemIconNameFor: anObject [
 	
 	^ nil
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesProcessor >> itemNameFor: anObject [
 	^ anObject displayString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesProcessor >> itemsLimit [
 	"Return the maximal number of elements that can be found during search.
 	Default implementation returns infinity, so the number of element is not limited."
 	^ Float infinity
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesProcessor >> origin [
 
 	^ origin
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesProcessor >> origin: anObject [
 
 	origin := anObject
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesProcessor >> prepareProcessorInContext: aContext [
 	super prepareProcessorInContext: aContext.
 	
 	self hasDynamicItems ifTrue: [ allCandidates := nil ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesProcessor >> title [
 	^ 'undefined'
 ]
diff --git a/src/NewTools-Spotter-Processors/StSpotterPragmaBasedProcessor.class.st b/src/NewTools-Spotter-Processors/StSpotterPragmaBasedProcessor.class.st
index dc8789b73..ab0c8650c 100644
--- a/src/NewTools-Spotter-Processors/StSpotterPragmaBasedProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StSpotterPragmaBasedProcessor.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #StSpotterPragmaBasedProcessor,
-	#superclass : #Object,
+	#name : 'StSpotterPragmaBasedProcessor',
+	#superclass : 'Object',
 	#instVars : [
 		'allFilteredCandidates',
 		'order',
@@ -10,34 +10,35 @@ Class {
 		'DefaultItemsLimit',
 		'DefaultNestedItemsLimit'
 	],
-	#category : #'NewTools-Spotter-Processors'
+	#category : 'NewTools-Spotter-Processors',
+	#package : 'NewTools-Spotter-Processors'
 }
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterPragmaBasedProcessor class >> defaultItemsLimit [
 
 	^ DefaultItemsLimit ifNil: [ DefaultItemsLimit := 25 ]
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterPragmaBasedProcessor class >> defaultItemsLimit: aValue [
 
 	DefaultItemsLimit := aValue
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterPragmaBasedProcessor class >> defaultNestedItemsLimit [
 
 	^ DefaultNestedItemsLimit ifNil: [ DefaultNestedItemsLimit := 2000 ]
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterPragmaBasedProcessor class >> defaultNestedItemsLimit: aValue [
 
 	DefaultNestedItemsLimit := aValue
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterPragmaBasedProcessor class >> settingsOn: aBuilder [
 	<systemsettings>
 
@@ -58,12 +59,12 @@ StSpotterPragmaBasedProcessor class >> settingsOn: aBuilder [
 		description: 'Number of total results per of category to show in Spotter'
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterPragmaBasedProcessor >> allFilteredCandidates [
 	^ allFilteredCandidates ifNil: [ allFilteredCandidates := OrderedCollection new ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterPragmaBasedProcessor >> continueFilterInContext: aSpotterContext [
 
 	" We DO NOT prepare the context since we could no longer continue producing filtered candidates. "
@@ -75,19 +76,19 @@ StSpotterPragmaBasedProcessor >> continueFilterInContext: aSpotterContext [
 		withArguments: { self allFilteredCandidates size . self }
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StSpotterPragmaBasedProcessor >> displayStringOn: stream [
 	stream 
 		nextPutAll: 'Processor: ';
 		nextPutAll: self title asString
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterPragmaBasedProcessor >> doContinueFilterInContext: aSpotterContext [
 	^ aSpotterContext doContinueFilterForProcessor: self
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterPragmaBasedProcessor >> doFilterInContext: aSpotterContext [
 	"override this method to:
 	- add items to the stream
@@ -95,7 +96,7 @@ StSpotterPragmaBasedProcessor >> doFilterInContext: aSpotterContext [
 	self subclassResponsibility
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterPragmaBasedProcessor >> filterInContext: aSpotterContext [
 
 	running := true.
@@ -117,19 +118,19 @@ StSpotterPragmaBasedProcessor >> filterInContext: aSpotterContext [
 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterPragmaBasedProcessor >> hasFilteredCandidates [
 	^ self allFilteredCandidates notEmpty
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterPragmaBasedProcessor >> initialize [ 
 
 	super initialize.
 	running := false
 ]
 
-{ #category : #'key-bindings' }
+{ #category : 'key-bindings' }
 StSpotterPragmaBasedProcessor >> installKeymappingsOn: aGTSpotterMorph [
 
 	self keyBinding
@@ -141,12 +142,12 @@ StSpotterPragmaBasedProcessor >> installKeymappingsOn: aGTSpotterMorph [
 				toAction: [ aGTSpotterMorph onKeyProcessor: self ] ]
 ]
 
-{ #category : #'key-bindings' }
+{ #category : 'key-bindings' }
 StSpotterPragmaBasedProcessor >> installKeymappingsOn: aPresenter onExecution: aBlock [
 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterPragmaBasedProcessor >> isRelevantForQuery: categoryQueryPrefix [
 	| trimmedProcessorTitle |
 	trimmedProcessorTitle := self title asLowercase 
@@ -155,59 +156,59 @@ StSpotterPragmaBasedProcessor >> isRelevantForQuery: categoryQueryPrefix [
 	^ trimmedProcessorTitle beginsWith: categoryQueryPrefix
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterPragmaBasedProcessor >> isRunning [ 
 	
 	^ running
 ]
 
-{ #category : #'key-bindings' }
+{ #category : 'key-bindings' }
 StSpotterPragmaBasedProcessor >> keyBinding [
 
 	^ nil
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterPragmaBasedProcessor >> order [
 	"Return assigned spotter order used to arrange categories in spotter UI"
 	^ order
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterPragmaBasedProcessor >> order: aNumber [
 	"Assign to processor its spotter order to arrange categories
 	within spotter ui"
 	order := aNumber
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterPragmaBasedProcessor >> prepareProcessorInContext: aContext [
 	allFilteredCandidates := nil
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterPragmaBasedProcessor >> shouldFilterInContext: aSpotterContext [
 	^ aSpotterContext notEmpty 
 		or: [ self wantsToDisplayOnEmptyQuery ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterPragmaBasedProcessor >> stop [
 	
 	running := false
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterPragmaBasedProcessor >> title [
 	self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterPragmaBasedProcessor >> wantsToDisplayOnEmptyQuery [
 	^ true
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterPragmaBasedProcessor >> withItemsLimit: aLimit do: aBlock [
 	^ aBlock value
 ]
diff --git a/src/NewTools-Spotter-Processors/StSpotterProcessor.class.st b/src/NewTools-Spotter-Processors/StSpotterProcessor.class.st
index 3ec275a40..7ef86b121 100644
--- a/src/NewTools-Spotter-Processors/StSpotterProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StSpotterProcessor.class.st
@@ -12,8 +12,8 @@ Also, there is #configureFilter to extend the configuration of the source when t
 I also handled the notifications when the query finish, so Spotter UI can show it correctly.
 "
 Class {
-	#name : #StSpotterProcessor,
-	#superclass : #Object,
+	#name : 'StSpotterProcessor',
+	#superclass : 'Object',
 	#instVars : [
 		'order',
 		'filter',
@@ -25,52 +25,54 @@ Class {
 	#classInstVars : [
 		'enabled'
 	],
-	#category : #'NewTools-Spotter-Processors-Processors'
+	#category : 'NewTools-Spotter-Processors-Processors',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Processors'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor class >> allConcreteSubclasses [
 	
 	^ self allSubclasses reject: [ :e | e isAbstract ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor class >> allEnabledSubclasses [
 	
 	^ self allConcreteSubclasses select: [ :e | e isEnabled ]
 ]
 
-{ #category : #'default-settings' }
+{ #category : 'default-settings' }
 StSpotterProcessor class >> defaultEnabled [
 
 	^ self subclassResponsibility 
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotterProcessor class >> enabled [ 
 
 	^ enabled ifNil: [ self defaultEnabled ]
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotterProcessor class >> enabled: aValue [
 
 	enabled := aValue
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotterProcessor class >> hideInSettings [
 
 	^ false
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterProcessor class >> isAbstract [ 
 
 	^ self == StSpotterProcessor 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterProcessor class >> isEnabled [
 
 	self isAbstract
@@ -78,19 +80,19 @@ StSpotterProcessor class >> isEnabled [
 	^ enabled ifNil: [ self defaultEnabled ] ifNotNil: [ enabled ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor class >> order [
 	
 	^ self subclassResponsibility 
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotterProcessor class >> settingsDescription [
 
 	^ self title
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotterProcessor class >> settingsOn: aBuilder [
 	<systemsettings>
 
@@ -112,25 +114,25 @@ StSpotterProcessor class >> settingsOn: aBuilder [
 				label: aProcessorClass settingsTitle ]
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotterProcessor class >> settingsTitle [
 
 	^ self title
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor class >> title [
 	
 	^ self subclassResponsibility 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor >> actLogic [
 
 	^ [ :anItem :aStep | anItem evaluateFor: aStep ]
 ]
 
-{ #category : #'spotter-api' }
+{ #category : 'spotter-api' }
 StSpotterProcessor >> allFilteredCandidates [
 
 	| result |
@@ -140,7 +142,7 @@ StSpotterProcessor >> allFilteredCandidates [
 	^ result
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StSpotterProcessor >> configureFilter [
 
 	self ensureFilter.
@@ -148,14 +150,14 @@ StSpotterProcessor >> configureFilter [
 		each filteringText: self query searchingText ]
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StSpotterProcessor >> ensureFilter [
 
 	^ filter ifNil: [
 		filter := self newSource ]
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StSpotterProcessor >> executeQuery [
 
 	(self query isSearchEmpty and: [ self showForEmptyQuery not ]) 
@@ -176,13 +178,13 @@ StSpotterProcessor >> executeQuery [
 	self query informAllResultAmount: results size
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StSpotterProcessor >> filter [ 
 	
 	^ filter ifNil: [ self ensureFilter ]
 ]
 
-{ #category : #'spotter-api' }
+{ #category : 'spotter-api' }
 StSpotterProcessor >> filterInContext: aSpotterContext [ 
 
 	self notifyStarted: aSpotterContext.
@@ -191,67 +193,67 @@ StSpotterProcessor >> filterInContext: aSpotterContext [
 	self notifyEnded: aSpotterContext.
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterProcessor >> initialize [
 
 	super initialize.
 	running := false.
 ]
 
-{ #category : #'key-bindings' }
+{ #category : 'key-bindings' }
 StSpotterProcessor >> installKeymappingsOn: aPresenter [ 
 	"Nothing to do"
 ]
 
-{ #category : #'key-bindings' }
+{ #category : 'key-bindings' }
 StSpotterProcessor >> installKeymappingsOn: aPresenter onExecution: aBlock [
 
 	self installKeymappingsOn: aPresenter
 ]
 
-{ #category : #'spotter-api' }
+{ #category : 'spotter-api' }
 StSpotterProcessor >> isRelevantForQuery: categoryQueryPrefix [
 
 	^ (self title asLowercase copyReplaceAll: String space with: '')
 			beginsWith: categoryQueryPrefix
 ]
 
-{ #category : #'spotter-api' }
+{ #category : 'spotter-api' }
 StSpotterProcessor >> isRunning [ 
 
 	^ running
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor >> itemIcon [
 
 	^ [ :anItem | anItem icon ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor >> itemIconName [
 
 	^ [ :item | item systemIconName ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor >> itemName [
 
 	^ [ :anItem | anItem asString ]
 ]
 
-{ #category : #'key-bindings' }
+{ #category : 'key-bindings' }
 StSpotterProcessor >> keyBinding [ 
 	^ nil
 ]
 
-{ #category : #configuration }
+{ #category : 'configuration' }
 StSpotterProcessor >> maxResults [
 
 	^ StSpotterPragmaBasedProcessor defaultItemsLimit
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StSpotterProcessor >> newSource [
 
 	| source |
@@ -264,13 +266,13 @@ StSpotterProcessor >> newSource [
 	
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StSpotterProcessor >> newTextFilteringSource [
 
 	self subclassResponsibility 
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StSpotterProcessor >> notifyEnded: aSpotterContext [
 
 	running := false.
@@ -280,7 +282,7 @@ StSpotterProcessor >> notifyEnded: aSpotterContext [
 
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StSpotterProcessor >> notifyStarted: aSpotterContext [
 
 	running := true.
@@ -290,19 +292,19 @@ StSpotterProcessor >> notifyStarted: aSpotterContext [
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor >> order [
 
 	^ order ifNil: [ self class order ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor >> order: aNumber [
 
 	^ order
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor >> query [
 
 	^ query ifNil: [ 
@@ -311,31 +313,31 @@ StSpotterProcessor >> query [
 			yourself ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor >> query: aQuery [
 
 	query := aQuery
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StSpotterProcessor >> render: anEntry [
 		
 	^ anEntry render
 ]
 
-{ #category : #configuration }
+{ #category : 'configuration' }
 StSpotterProcessor >> showForEmptyQuery [
 
 	^ false
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StSpotterProcessor >> stop [
 
 	running := false
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessor >> title [
 
 	^ self class title
diff --git a/src/NewTools-Spotter-Processors/StSubStringFilter.class.st b/src/NewTools-Spotter-Processors/StSubStringFilter.class.st
index a281562f1..8b90db6e5 100644
--- a/src/NewTools-Spotter-Processors/StSubStringFilter.class.st
+++ b/src/NewTools-Spotter-Processors/StSubStringFilter.class.st
@@ -2,12 +2,14 @@
 I implement a simple substring string filter using includesSubstring:.
 "
 Class {
-	#name : #StSubStringFilter,
-	#superclass : #StAbstractStringFilter,
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#name : 'StSubStringFilter',
+	#superclass : 'StAbstractStringFilter',
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #protected }
+{ #category : 'protected' }
 StSubStringFilter >> criterium: aValue [
 
 	^ aValue asString asLowercase includesSubstring: filteringText asLowercase
@@ -15,7 +17,7 @@ StSubStringFilter >> criterium: aValue [
 
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StSubStringFilter >> substringFilter: aString [
 	
 	self filteringText: aString
diff --git a/src/NewTools-Spotter-Processors/StTransformation.class.st b/src/NewTools-Spotter-Processors/StTransformation.class.st
index 95c76a3d7..efe2b85ce 100644
--- a/src/NewTools-Spotter-Processors/StTransformation.class.st
+++ b/src/NewTools-Spotter-Processors/StTransformation.class.st
@@ -4,17 +4,19 @@ I apply the block and transform the elements returned by myself.
 
 "
 Class {
-	#name : #StTransformation,
-	#superclass : #StIteratorBlockDecorator,
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#name : 'StTransformation',
+	#superclass : 'StIteratorBlockDecorator',
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StTransformation >> next [
 	^ inner next ifNotNil: [ :aValue | self transform: aValue ]
 ]
 
-{ #category : #tranforming }
+{ #category : 'tranforming' }
 StTransformation >> transform: anElement [
 
 	^ aBlock value: anElement
diff --git a/src/NewTools-Spotter-Processors/StUnifiedProcessor.class.st b/src/NewTools-Spotter-Processors/StUnifiedProcessor.class.st
index 87d0f2093..9586dcd05 100644
--- a/src/NewTools-Spotter-Processors/StUnifiedProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StUnifiedProcessor.class.st
@@ -11,45 +11,47 @@ My source is a complex one:
  - I first search for matches starting with the query and then for matches with the query in any place of the entry.
 "
 Class {
-	#name : #StUnifiedProcessor,
-	#superclass : #StSpotterProcessor,
+	#name : 'StUnifiedProcessor',
+	#superclass : 'StSpotterProcessor',
 	#instVars : [
 		'categories'
 	],
-	#category : #'NewTools-Spotter-Processors-Processors'
+	#category : 'NewTools-Spotter-Processors-Processors',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Processors'
 }
 
-{ #category : #'default-settings' }
+{ #category : 'default-settings' }
 StUnifiedProcessor class >> defaultEnabled [
 
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StUnifiedProcessor class >> order [
 	
 	^ 100
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StUnifiedProcessor class >> settingsDescription [
 
 	^ 'I am the main processor: I show classes, packages and implementors'
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StUnifiedProcessor class >> settingsTitle [
 
 	^ 'Classes, Implementors & Packages'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StUnifiedProcessor class >> title [
 
 	^ 'Results'
 ]
 
-{ #category : #sources }
+{ #category : 'sources' }
 StUnifiedProcessor >> calculateLowercaseSourcesOn: anStream [
 
 	| implementorsBeginsWith implementorsSubstring wordsAwareImplementors |
@@ -73,7 +75,7 @@ StUnifiedProcessor >> calculateLowercaseSourcesOn: anStream [
 
 ]
 
-{ #category : #sources }
+{ #category : 'sources' }
 StUnifiedProcessor >> calculateUppercaseSourcesOn: anStream [
 	| classesBeginsWith classesIncludesString packagesBeginsWith packagesIncludesString wordsAwareClassesSource wordsAwarePackageSource classAndSelectorImplementors |
 	
@@ -132,7 +134,7 @@ StUnifiedProcessor >> calculateUppercaseSourcesOn: anStream [
 			anStream nextPut: wordsAwarePackageSource ]
 ]
 
-{ #category : #sources }
+{ #category : 'sources' }
 StUnifiedProcessor >> categoriesIncludes: aCategory [
 
 	^ categories isNil 
@@ -141,13 +143,13 @@ StUnifiedProcessor >> categoriesIncludes: aCategory [
 		or: [ categories anySatisfy: [ :each | aCategory asLowercase beginsWith: each asLowercase ] ] ] ]
 ]
 
-{ #category : #'spotter-api' }
+{ #category : 'spotter-api' }
 StUnifiedProcessor >> classesTag [
 
 	^ #Classes
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StUnifiedProcessor >> configureFilter [
 
 	(categories ~= self query categoriesSelected)
@@ -161,13 +163,13 @@ StUnifiedProcessor >> configureFilter [
 	filter clearDuplicates
 ]
 
-{ #category : #'spotter-api' }
+{ #category : 'spotter-api' }
 StUnifiedProcessor >> implementorsTag [
 
 	^ #Implementors
 ]
 
-{ #category : #'key-bindings' }
+{ #category : 'key-bindings' }
 StUnifiedProcessor >> installKeymappingsOn: aPresenter onExecution: aBlock [
 
 	aPresenter
@@ -189,13 +191,13 @@ StUnifiedProcessor >> installKeymappingsOn: aPresenter onExecution: aBlock [
 			aBlock cull: self ]	
 ]
 
-{ #category : #'spotter-api' }
+{ #category : 'spotter-api' }
 StUnifiedProcessor >> isRelevantForQuery: aString [ 
 	
 	^ true
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StUnifiedProcessor >> newSource [
 	| uppercaseIterators lowercaseIterators caseSelectorIterator root |
 	
@@ -216,13 +218,13 @@ StUnifiedProcessor >> newSource [
 	^ root
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StUnifiedProcessor >> newTextFilteringSource [
 	"It should not arrive here"
 	^ nil
 ]
 
-{ #category : #'spotter-api' }
+{ #category : 'spotter-api' }
 StUnifiedProcessor >> packagesTag [
 
 	^ #Packages
diff --git a/src/NewTools-Spotter-Processors/StWindowEntry.class.st b/src/NewTools-Spotter-Processors/StWindowEntry.class.st
index 6544452cd..b9d9261fd 100644
--- a/src/NewTools-Spotter-Processors/StWindowEntry.class.st
+++ b/src/NewTools-Spotter-Processors/StWindowEntry.class.st
@@ -2,24 +2,26 @@
 I wrap a Window, to modify its behavior if required for the spotter
 "
 Class {
-	#name : #StWindowEntry,
-	#superclass : #StEntry,
-	#category : #'NewTools-Spotter-Processors-Entries'
+	#name : 'StWindowEntry',
+	#superclass : 'StEntry',
+	#category : 'NewTools-Spotter-Processors-Entries',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Entries'
 }
 
-{ #category : #converting }
+{ #category : 'converting' }
 StWindowEntry >> asString [ 
 
 	^ '{1} [{2}]' format: { content label. content className }
 ]
 
-{ #category : #evaluating }
+{ #category : 'evaluating' }
 StWindowEntry >> doEvaluate [
 
 	content stActDefault
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StWindowEntry >> iconName [
 	
 	^ content systemIconName
diff --git a/src/NewTools-Spotter-Processors/StWindowsProcessor.class.st b/src/NewTools-Spotter-Processors/StWindowsProcessor.class.st
index 97a970cb3..400b4bb8c 100644
--- a/src/NewTools-Spotter-Processors/StWindowsProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StWindowsProcessor.class.st
@@ -2,43 +2,45 @@
 I am a processor to get all the windows open in the world. It filters out the top most window
 "
 Class {
-	#name : #StWindowsProcessor,
-	#superclass : #StCollectionBasedProcessor,
-	#category : #'NewTools-Spotter-Processors-Processors'
+	#name : 'StWindowsProcessor',
+	#superclass : 'StCollectionBasedProcessor',
+	#category : 'NewTools-Spotter-Processors-Processors',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Processors'
 }
 
-{ #category : #'default-settings' }
+{ #category : 'default-settings' }
 StWindowsProcessor class >> defaultEnabled [
 
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StWindowsProcessor class >> order [
 	
 	^ 50
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StWindowsProcessor class >> title [
 
 	^ 'Windows'
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StWindowsProcessor >> collection [
 
 	^ (self currentWorld submorphs select: [ :window | window isKindOf: SystemWindow ]) 
 		ifNotEmpty: [ :aCollection | aCollection allButFirst ]
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StWindowsProcessor >> newEntryOn: anElement [
 
 	^ StWindowEntry on: anElement
 ]
 
-{ #category : #configuration }
+{ #category : 'configuration' }
 StWindowsProcessor >> showForEmptyQuery [
 
 	^ true
diff --git a/src/NewTools-Spotter-Processors/StWithoutDuplicatesDecorator.class.st b/src/NewTools-Spotter-Processors/StWithoutDuplicatesDecorator.class.st
index 12cebd7e6..9ffabbf58 100644
--- a/src/NewTools-Spotter-Processors/StWithoutDuplicatesDecorator.class.st
+++ b/src/NewTools-Spotter-Processors/StWithoutDuplicatesDecorator.class.st
@@ -3,15 +3,17 @@ I implement a decorator for the iterators.
 I don't allow duplicates to be returned. For doing so, I have a collection of the already returned values, so I can filter duplicates.
 "
 Class {
-	#name : #StWithoutDuplicatesDecorator,
-	#superclass : #StIteratorDecorator,
+	#name : 'StWithoutDuplicatesDecorator',
+	#superclass : 'StIteratorDecorator',
 	#instVars : [
 		'uniqueResults'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StWithoutDuplicatesDecorator class >> on: anInner [
 
 	^ self new 
@@ -19,27 +21,27 @@ StWithoutDuplicatesDecorator class >> on: anInner [
 		yourself
 ]
 
-{ #category : #resetting }
+{ #category : 'resetting' }
 StWithoutDuplicatesDecorator >> clearDuplicates [
 	
 	uniqueResults removeAll
 ]
 
-{ #category : #protected }
+{ #category : 'protected' }
 StWithoutDuplicatesDecorator >> doReset [ 
 
 	inner reset.
 	self clearDuplicates
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StWithoutDuplicatesDecorator >> initialize [ 
 
 	super initialize.
 	uniqueResults := Set new.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StWithoutDuplicatesDecorator >> next [
 
 	| aValue |
diff --git a/src/NewTools-Spotter-Processors/StWordsAwareFilter.class.st b/src/NewTools-Spotter-Processors/StWordsAwareFilter.class.st
index bb13f48d5..9973af55e 100644
--- a/src/NewTools-Spotter-Processors/StWordsAwareFilter.class.st
+++ b/src/NewTools-Spotter-Processors/StWordsAwareFilter.class.st
@@ -6,23 +6,25 @@ My iterator is query with the first word of the filtering text and the filtering
 For example, doing the query StoreDisk will answer also DiskStore 
 "
 Class {
-	#name : #StWordsAwareFilter,
-	#superclass : #StIteratorDecorator,
+	#name : 'StWordsAwareFilter',
+	#superclass : 'StIteratorDecorator',
 	#instVars : [
 		'words',
 		'realFilter'
 	],
-	#category : #'NewTools-Spotter-Processors-Iterators'
+	#category : 'NewTools-Spotter-Processors-Iterators',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Iterators'
 }
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StWordsAwareFilter >> additionalFilter: aString firstWord: firstWord otherWords: otherWords on: anEntry [
 
 	^ otherWords allSatisfy: [ :otherW | anEntry asString asLowercase includesSubstring: otherW ]
 
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StWordsAwareFilter >> filteringText: aString [
 
 	| firstWord otherWords |
@@ -39,14 +41,14 @@ StWordsAwareFilter >> filteringText: aString [
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StWordsAwareFilter >> inner: anIterator [
 
 	inner := anIterator.
 	realFilter := anIterator
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StWordsAwareFilter >> splitWords: aString [
 
 	^ (aString substrings: ' :-')
diff --git a/src/NewTools-Spotter-Processors/StWorldMenuEntry.class.st b/src/NewTools-Spotter-Processors/StWorldMenuEntry.class.st
index c2832faaf..af26bc66a 100644
--- a/src/NewTools-Spotter-Processors/StWorldMenuEntry.class.st
+++ b/src/NewTools-Spotter-Processors/StWorldMenuEntry.class.st
@@ -2,37 +2,39 @@
 I wrap a World menu entry, to modify its behavior if required for the spotter
 "
 Class {
-	#name : #StWorldMenuEntry,
-	#superclass : #StEntry,
-	#category : #'NewTools-Spotter-Processors-Entries'
+	#name : 'StWorldMenuEntry',
+	#superclass : 'StEntry',
+	#category : 'NewTools-Spotter-Processors-Entries',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Entries'
 }
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StWorldMenuEntry >> = anEntry [
 
 	^ self species = anEntry species
 		and: [ anEntry asString = self asString ]
 ]
 
-{ #category : #converting }
+{ #category : 'converting' }
 StWorldMenuEntry >> asString [ 
 
 	^ content contents
 ]
 
-{ #category : #evaluating }
+{ #category : 'evaluating' }
 StWorldMenuEntry >> doEvaluate [ 
 
 	content stActDefault
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StWorldMenuEntry >> iconName [
 	"content is already a morph with an icon"
 	^ nil
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StWorldMenuEntry >> iconOn: anApplication [
 
 	"world menu intries are morphic elements that already contain an icon"
diff --git a/src/NewTools-Spotter-Processors/StWorldMenuProcessor.class.st b/src/NewTools-Spotter-Processors/StWorldMenuProcessor.class.st
index 8051ae8a0..5e5fa1187 100644
--- a/src/NewTools-Spotter-Processors/StWorldMenuProcessor.class.st
+++ b/src/NewTools-Spotter-Processors/StWorldMenuProcessor.class.st
@@ -2,30 +2,32 @@
 I am a simple processor that returns all the world menu entries. 
 "
 Class {
-	#name : #StWorldMenuProcessor,
-	#superclass : #StSpotterProcessor,
-	#category : #'NewTools-Spotter-Processors-Processors'
+	#name : 'StWorldMenuProcessor',
+	#superclass : 'StSpotterProcessor',
+	#category : 'NewTools-Spotter-Processors-Processors',
+	#package : 'NewTools-Spotter-Processors',
+	#tag : 'Processors'
 }
 
-{ #category : #'default-settings' }
+{ #category : 'default-settings' }
 StWorldMenuProcessor class >> defaultEnabled [
 
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StWorldMenuProcessor class >> order [
 	
 	^ 90
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StWorldMenuProcessor class >> title [
 
 	^ 'Menu'
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StWorldMenuProcessor >> askingForMenu [
 
 	^ (query hasCategoryMatching: #menu) 
@@ -33,20 +35,20 @@ StWorldMenuProcessor >> askingForMenu [
 		or: [ query hasAnyCategory not and: [ query isSearchEmpty ] ] ]
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StWorldMenuProcessor >> executeQuery [
 
 	self askingForMenu ifFalse: [ ^ self ].
 	^ super executeQuery
 ]
 
-{ #category : #'spotter-api' }
+{ #category : 'spotter-api' }
 StWorldMenuProcessor >> isRelevantForQuery: aString [ 
 	
 	^ true
 ]
 
-{ #category : #filtering }
+{ #category : 'filtering' }
 StWorldMenuProcessor >> newTextFilteringSource [
 
 	^ ((StGeneratorBlockIterator
@@ -54,7 +56,7 @@ StWorldMenuProcessor >> newTextFilteringSource [
 		collect: [ :e | StWorldMenuEntry on: e ]) asSubstringFilter
 ]
 
-{ #category : #configuration }
+{ #category : 'configuration' }
 StWorldMenuProcessor >> showForEmptyQuery [
 
 	^ true
diff --git a/src/NewTools-Spotter-Processors/String.extension.st b/src/NewTools-Spotter-Processors/String.extension.st
index 1de063750..e881d69dc 100644
--- a/src/NewTools-Spotter-Processors/String.extension.st
+++ b/src/NewTools-Spotter-Processors/String.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #String }
+Extension { #name : 'String' }
 
-{ #category : #'*NewTools-Spotter-Processors' }
+{ #category : '*NewTools-Spotter-Processors' }
 String >> splitCamelCase [
 	
 	| results accum previousIsLower |
diff --git a/src/NewTools-Spotter-Processors/package.st b/src/NewTools-Spotter-Processors/package.st
index edf94d706..6ce6e6eef 100644
--- a/src/NewTools-Spotter-Processors/package.st
+++ b/src/NewTools-Spotter-Processors/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Spotter-Processors' }
+Package { #name : 'NewTools-Spotter-Processors' }
diff --git a/src/NewTools-Spotter-Tests/StSpotterBaseTest.class.st b/src/NewTools-Spotter-Tests/StSpotterBaseTest.class.st
index 946ec5422..05b78ba6c 100644
--- a/src/NewTools-Spotter-Tests/StSpotterBaseTest.class.st
+++ b/src/NewTools-Spotter-Tests/StSpotterBaseTest.class.st
@@ -1,33 +1,34 @@
 Class {
-	#name : #StSpotterBaseTest,
-	#superclass : #TestCase,
+	#name : 'StSpotterBaseTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'backendForTest'
 	],
-	#category : #'NewTools-Spotter-Tests'
+	#category : 'NewTools-Spotter-Tests',
+	#package : 'NewTools-Spotter-Tests'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterBaseTest class >> isAbstract [
 
 	^ super isAbstract or: [ self = StSpotterBaseTest ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterBaseTest >> defer: aBlock [
 
 	World defer: aBlock.
 	self waitUntilUIRedrawed
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 StSpotterBaseTest >> setUp [
 
 	super setUp.
 	backendForTest := SpMorphicBackendForTest new
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterBaseTest >> waitUntilEnded: model [
 
 	[ (StSpotterModel delayBeforeQuery + 50 milliSeconds) wait ] 
@@ -36,7 +37,7 @@ StSpotterBaseTest >> waitUntilEnded: model [
 
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterBaseTest >> waitUntilUIRedrawed [
 
 	backendForTest waitUntilUIRedrawed
diff --git a/src/NewTools-Spotter-Tests/StSpotterModelTest.class.st b/src/NewTools-Spotter-Tests/StSpotterModelTest.class.st
index 532fe01a3..b28c1a078 100644
--- a/src/NewTools-Spotter-Tests/StSpotterModelTest.class.st
+++ b/src/NewTools-Spotter-Tests/StSpotterModelTest.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #StSpotterModelTest,
-	#superclass : #StSpotterBaseTest,
-	#category : #'NewTools-Spotter-Tests'
+	#name : 'StSpotterModelTest',
+	#superclass : 'StSpotterBaseTest',
+	#category : 'NewTools-Spotter-Tests',
+	#package : 'NewTools-Spotter-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 StSpotterModelTest >> testAnnounceQueryEndedIsSentOnce [
 	| model count |
 
@@ -23,7 +24,7 @@ StSpotterModelTest >> testAnnounceQueryEndedIsSentOnce [
 	self assert: count equals: 1.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StSpotterModelTest >> testSpotterModelShouldWaitToPerformActualSearch [
 
 	| model started |
diff --git a/src/NewTools-Spotter-Tests/StSpotterTest.class.st b/src/NewTools-Spotter-Tests/StSpotterTest.class.st
index 970b3be06..e567a6396 100644
--- a/src/NewTools-Spotter-Tests/StSpotterTest.class.st
+++ b/src/NewTools-Spotter-Tests/StSpotterTest.class.st
@@ -1,20 +1,21 @@
 Class {
-	#name : #StSpotterTest,
-	#superclass : #StSpotterBaseTest,
+	#name : 'StSpotterTest',
+	#superclass : 'StSpotterBaseTest',
 	#instVars : [
 		'spotter'
 	],
-	#category : #'NewTools-Spotter-Tests'
+	#category : 'NewTools-Spotter-Tests',
+	#package : 'NewTools-Spotter-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 StSpotterTest >> setUp [
 	
 	super setUp.
 	spotter := StSpotter new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StSpotterTest >> testOpenSpotterRefreshesPreviewOnce [
 
 	| count |
@@ -34,7 +35,7 @@ StSpotterTest >> testOpenSpotterRefreshesPreviewOnce [
 	self assert: count equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 StSpotterTest >> testSearchingString [
 
 	spotter searchText text: 'Test'.
diff --git a/src/NewTools-Spotter-Tests/package.st b/src/NewTools-Spotter-Tests/package.st
index d92d15d18..a7dd4016a 100644
--- a/src/NewTools-Spotter-Tests/package.st
+++ b/src/NewTools-Spotter-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Spotter-Tests' }
+Package { #name : 'NewTools-Spotter-Tests' }
diff --git a/src/NewTools-Spotter/BlockClosure.extension.st b/src/NewTools-Spotter/BlockClosure.extension.st
index d9f99cc68..84a302383 100644
--- a/src/NewTools-Spotter/BlockClosure.extension.st
+++ b/src/NewTools-Spotter/BlockClosure.extension.st
@@ -1,12 +1,12 @@
-Extension { #name : #BlockClosure }
+Extension { #name : 'BlockClosure' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 BlockClosure >> stHasDynamicItems [
 
 	^ self numArgs ~= 0
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 BlockClosure >> stIterator [
 	
 	^ StSpotterBlockIterator new 
diff --git a/src/NewTools-Spotter/Class.extension.st b/src/NewTools-Spotter/Class.extension.st
index 5f30b0ec7..c36f8cf98 100644
--- a/src/NewTools-Spotter/Class.extension.st
+++ b/src/NewTools-Spotter/Class.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #Class }
+Extension { #name : 'Class' }
 
-{ #category : #'*NewTools-Spotter-Extensions' }
+{ #category : '*NewTools-Spotter-Extensions' }
 Class >> spotterPreview: aBuilder [
 
 	^ aBuilder newCode
diff --git a/src/NewTools-Spotter/CmdCommandActivator.extension.st b/src/NewTools-Spotter/CmdCommandActivator.extension.st
index d20d996ff..1a004be46 100644
--- a/src/NewTools-Spotter/CmdCommandActivator.extension.st
+++ b/src/NewTools-Spotter/CmdCommandActivator.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #CmdCommandActivator }
+Extension { #name : 'CmdCommandActivator' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 CmdCommandActivator >> evaluateFor: aStSpotter [ 
 	
 	self doEvaluate
diff --git a/src/NewTools-Spotter/DoubleLinkedList.extension.st b/src/NewTools-Spotter/DoubleLinkedList.extension.st
index 528405098..3462833c1 100644
--- a/src/NewTools-Spotter/DoubleLinkedList.extension.st
+++ b/src/NewTools-Spotter/DoubleLinkedList.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #DoubleLinkedList }
+Extension { #name : 'DoubleLinkedList' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 DoubleLinkedList >> stNoneSatisfy: aBlock [
 	"Evaluate aBlock with the elements of the receiver. If aBlock returns false for all elements return true. Otherwise return false"
 
@@ -8,7 +8,7 @@ DoubleLinkedList >> stNoneSatisfy: aBlock [
 	^ true
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 DoubleLinkedList >> stRemoveCycledLink: link [
 	| predecessor successor |
 	predecessor := link previousLink.
@@ -30,7 +30,7 @@ DoubleLinkedList >> stRemoveCycledLink: link [
 	^ link
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 DoubleLinkedList >> stTail [
 
 	^ tail
diff --git a/src/NewTools-Spotter/Object.extension.st b/src/NewTools-Spotter/Object.extension.st
index af87fec6b..41e1dfd98 100644
--- a/src/NewTools-Spotter/Object.extension.st
+++ b/src/NewTools-Spotter/Object.extension.st
@@ -1,43 +1,43 @@
-Extension { #name : #Object }
+Extension { #name : 'Object' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 Object >> asStSpotterCandidateLink [
 
 	^ StSpotterCandidateLink value: self
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 Object >> asStSpotterProcessorLink [
 
 	^ StSpotterProcessorLink value: self
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 Object >> spotterPreview: aBuilder [
 
 	^ self asString spotterPreview: aBuilder
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 Object >> stActDefault [
 
 	^ self inspect
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 Object >> stFilter [
 
 	^ StFilterBlock stFilter
 		
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 Object >> stListFilter [
 
 	^ StFilterSubstring new
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 Object >> stSpotterProcessorsFor: aSpotterStep [
 	"This is a utility method that collects all extensions (processors) for the current object.
 	By default, it simply looks for the #spotterOrder: pragma.
diff --git a/src/NewTools-Spotter/SequenceableCollection.extension.st b/src/NewTools-Spotter/SequenceableCollection.extension.st
index 5d457abc9..9edd680a8 100644
--- a/src/NewTools-Spotter/SequenceableCollection.extension.st
+++ b/src/NewTools-Spotter/SequenceableCollection.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #SequenceableCollection }
+Extension { #name : 'SequenceableCollection' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 SequenceableCollection >> stFasterDifferencePreservingOrder: aCollection [
 	" this implementation does not preserve the original species of self ! it serves ONE specific use case only "
 	| newCollection |
diff --git a/src/NewTools-Spotter/StBaseFilter.class.st b/src/NewTools-Spotter/StBaseFilter.class.st
index ca4dabc10..e2799454e 100644
--- a/src/NewTools-Spotter/StBaseFilter.class.st
+++ b/src/NewTools-Spotter/StBaseFilter.class.st
@@ -6,41 +6,43 @@ It returns the list of all items that match the filter, but subclasses should on
 
 "
 Class {
-	#name : #StBaseFilter,
-	#superclass : #Object,
+	#name : 'StBaseFilter',
+	#superclass : 'Object',
 	#instVars : [
 		'context',
 		'filteredItems',
 		'streamed'
 	],
-	#category : #'NewTools-Spotter-Filters'
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
 
-{ #category : #public }
+{ #category : 'public' }
 StBaseFilter class >> stFilter [
 
 	^ self new
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StBaseFilter class >> stListFilter [
 
 	^ self new
 ]
 
-{ #category : #'private - model' }
+{ #category : 'private - model' }
 StBaseFilter >> addItem: anItem [
 	self context streamed add: anItem.
 	self context addItem: anItem
 ]
 
-{ #category : #'private - model' }
+{ #category : 'private - model' }
 StBaseFilter >> addItems: aCollection [
 	self context streamed addAll: aCollection.
 	self context addItems: aCollection
 ]
 
-{ #category : #'private - model' }
+{ #category : 'private - model' }
 StBaseFilter >> allItems [
 	" WARNING: #allItems might be a list, block or iterator. we have to evaluate it in order to calculate the remaining/unstreamed items. #allItems are/were designed to be polymorphic to collections and streams. so this should be safe "
 	| allItems |
@@ -51,123 +53,123 @@ StBaseFilter >> allItems [
 		ifFalse: [ allItems ]
 ]
 
-{ #category : #'private - model' }
+{ #category : 'private - model' }
 StBaseFilter >> allItemsDo: aBlock [
 	self allItems do: aBlock
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StBaseFilter >> applyFilter [
 	^ self filteredItems
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StBaseFilter >> applyFilterInContext: aSpotterContext [
 	self prepareFilterInContext: aSpotterContext.
 	^ self applyFilter
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StBaseFilter >> applyFilterInContext: aSpotterContext error: anException [
 	('[Spotter] Exception in filter <' , self class name , '>: '
 		, anException asString) traceCr.
 	^ self defaultFilteredItems
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StBaseFilter >> context [
 	^ context
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StBaseFilter >> context: anObject [
 	context := anObject
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StBaseFilter >> defaultFilteredItems [
 	^ OrderedCollection new: 100 " not a limitation, just a reasonable start size "
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StBaseFilter >> defaultStreamed [
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StBaseFilter >> filteredItems [
 	^ filteredItems
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StBaseFilter >> filteredItems: aCollection [
 	filteredItems := aCollection
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StBaseFilter >> hasFilteredItems [
 	^ self filteredItems isEmptyOrNil not
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StBaseFilter >> initialize [
 	super initialize.
 	
 	self filteredItems: self defaultFilteredItems
 ]
 
-{ #category : #'private - model' }
+{ #category : 'private - model' }
 StBaseFilter >> itemFilterNameFor: anItem [
 	"I return the string/text representation of an item used by the filter."
 	
 	^ self processor itemFilterNameFor: anItem
 ]
 
-{ #category : #'private - model' }
+{ #category : 'private - model' }
 StBaseFilter >> itemsLimit [
 	^ self context itemsLimit
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StBaseFilter >> prepareFilterInContext: aSpotterContext [
 	"I provide a hook for preprocessing the query once before performing a search."
 	
 	self context: aSpotterContext.
 ]
 
-{ #category : #'private - model' }
+{ #category : 'private - model' }
 StBaseFilter >> processor [
 	^ self context processor
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StBaseFilter >> stFilter [
 
 	^ self
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StBaseFilter >> stListFilter [
 
 	^ self
 ]
 
-{ #category : #'private - model' }
+{ #category : 'private - model' }
 StBaseFilter >> step [
 	^ self context step
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StBaseFilter >> streamed [
 	^ streamed ifNil: [ streamed := self defaultStreamed ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StBaseFilter >> streamed: anObject [
 	streamed := anObject
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StBaseFilter >> value: aSpotterContext [
 	"I provide an entry point for performing a search that is 
 	polymorphic with BlockClosure>>value:. I return the list of
diff --git a/src/NewTools-Spotter/StClassEntry.extension.st b/src/NewTools-Spotter/StClassEntry.extension.st
index 2078ce1a4..613954a9b 100644
--- a/src/NewTools-Spotter/StClassEntry.extension.st
+++ b/src/NewTools-Spotter/StClassEntry.extension.st
@@ -1,12 +1,12 @@
-Extension { #name : #StClassEntry }
+Extension { #name : 'StClassEntry' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StClassEntry >> headerCategoryForUnifiedProcessor: aLink on: aSpotterPresenter [
 
 	^ aSpotterPresenter headerCategoryUnifiedFor: aLink
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StClassEntry class >> prepareUnifiedHeaderDescriptionFor: aHeaderPresenter [
 
 	^ aHeaderPresenter prepareAsClasses
diff --git a/src/NewTools-Spotter/StEntry.extension.st b/src/NewTools-Spotter/StEntry.extension.st
index 6fc5d9ceb..996603c89 100644
--- a/src/NewTools-Spotter/StEntry.extension.st
+++ b/src/NewTools-Spotter/StEntry.extension.st
@@ -1,13 +1,13 @@
-Extension { #name : #StEntry }
+Extension { #name : 'StEntry' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StEntry >> headerCategoryForUnifiedProcessor: aLink on: aSpotterPresenter [
 
 	^ aSpotterPresenter headerCategoryFor: aLink 			
 
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StEntry class >> prepareUnifiedHeaderDescriptionFor: aHeaderPresenter [
 	"do nothing"
 ]
diff --git a/src/NewTools-Spotter/StFilterAlike.class.st b/src/NewTools-Spotter/StFilterAlike.class.st
index b7773e5ea..23947e37d 100644
--- a/src/NewTools-Spotter/StFilterAlike.class.st
+++ b/src/NewTools-Spotter/StFilterAlike.class.st
@@ -3,16 +3,18 @@ Filter ""alike"" items.
 It usues the `String>>#alike:` method to obtain the matching elements. 
 "
 Class {
-	#name : #StFilterAlike,
-	#superclass : #StOrderedFilter,
+	#name : 'StFilterAlike',
+	#superclass : 'StOrderedFilter',
 	#instVars : [
 		'lowerThreshold',
 		'upperThreshold'
 	],
-	#category : #'NewTools-Spotter-Filters'
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterAlike >> applyFilterWithQuery [
 	| allItemsPrepocessed allItemsPrepocessedAndSorted alikeMatches otherMatches upper lower |
 	alikeMatches := OrderedCollection  new.
@@ -45,29 +47,29 @@ StFilterAlike >> applyFilterWithQuery [
 	self filteredItems: alikeMatches , otherMatches 
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StFilterAlike >> defaultLowerThreshold [
 	" lower threshold: to cut off the large irrelevent chunk before sorting/filtering is appplied "
 	^ 0.33
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StFilterAlike >> defaultUpperThreshold [
 	" upper threshold: to keep a reasonably sized set of interesting matches "
 	^ 0.45
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFilterAlike >> lowerThreshold [
 	^ lowerThreshold
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFilterAlike >> lowerThreshold: anObject [
 	lowerThreshold := anObject
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterAlike >> prepareFilterInContext: aSpotterContext [
 	super prepareFilterInContext: aSpotterContext.
 	
@@ -75,12 +77,12 @@ StFilterAlike >> prepareFilterInContext: aSpotterContext [
 	upperThreshold ifNil: [ upperThreshold := self defaultUpperThreshold ]. " performance optimization "
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFilterAlike >> upperThreshold [
 	^ upperThreshold
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFilterAlike >> upperThreshold: anObject [
 	upperThreshold := anObject
 ]
diff --git a/src/NewTools-Spotter/StFilterBlock.class.st b/src/NewTools-Spotter/StFilterBlock.class.st
index 44e921e89..e1739f570 100644
--- a/src/NewTools-Spotter/StFilterBlock.class.st
+++ b/src/NewTools-Spotter/StFilterBlock.class.st
@@ -2,15 +2,17 @@
 A filter that evaluates a block to obtain matching items.
 "
 Class {
-	#name : #StFilterBlock,
-	#superclass : #StUnorderedFilter,
+	#name : 'StFilterBlock',
+	#superclass : 'StUnorderedFilter',
 	#instVars : [
 		'matcher'
 	],
-	#category : #'NewTools-Spotter-Filters'
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterBlock >> isMatchedItem: anItem [
 
 	^ self matcher 
@@ -19,12 +21,12 @@ StFilterBlock >> isMatchedItem: anItem [
 		
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFilterBlock >> matcher [
 	^ matcher
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFilterBlock >> matcher: anObject [
 	matcher := anObject
 ]
diff --git a/src/NewTools-Spotter/StFilterFuzzy.class.st b/src/NewTools-Spotter/StFilterFuzzy.class.st
index a673c94ed..129488918 100644
--- a/src/NewTools-Spotter/StFilterFuzzy.class.st
+++ b/src/NewTools-Spotter/StFilterFuzzy.class.st
@@ -2,12 +2,14 @@
 A filter that uses the `FuzzyMatcher` to obtain matching items.
 "
 Class {
-	#name : #StFilterFuzzy,
-	#superclass : #StOrderedFilter,
-	#category : #'NewTools-Spotter-Filters'
+	#name : 'StFilterFuzzy',
+	#superclass : 'StOrderedFilter',
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterFuzzy >> applyFilterWithQuery [
 	
 	| result |
diff --git a/src/NewTools-Spotter/StFilterRegex.class.st b/src/NewTools-Spotter/StFilterRegex.class.st
index 79f779883..812114ee3 100644
--- a/src/NewTools-Spotter/StFilterRegex.class.st
+++ b/src/NewTools-Spotter/StFilterRegex.class.st
@@ -2,15 +2,17 @@
 A filter that executes regex to each item to obtain matching items.
 "
 Class {
-	#name : #StFilterRegex,
-	#superclass : #StUnorderedFilter,
+	#name : 'StFilterRegex',
+	#superclass : 'StUnorderedFilter',
 	#instVars : [
 		'regex'
 	],
-	#category : #'NewTools-Spotter-Filters'
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterRegex >> applyFilterInContext: aSpotterContext error: exception [
 	
 	super applyFilterInContext: aSpotterContext error: exception.
@@ -19,12 +21,12 @@ StFilterRegex >> applyFilterInContext: aSpotterContext error: exception [
 		yourself) value: aSpotterContext
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterRegex >> isMatchedItem: anItem [
 	^ self regex matches: (self itemFilterNameFor: anItem)
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterRegex >> prepareFilterInContext: aSpotterContext [
 	super prepareFilterInContext: aSpotterContext.
 	
@@ -33,12 +35,12 @@ StFilterRegex >> prepareFilterInContext: aSpotterContext [
 		ifFalse: [ self query asRegexIgnoringCase ])
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFilterRegex >> regex [
 	^ regex
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFilterRegex >> regex: anObject [
 	regex := anObject
 ]
diff --git a/src/NewTools-Spotter/StFilterStringMatch.class.st b/src/NewTools-Spotter/StFilterStringMatch.class.st
index c3ca99ece..656dffdc0 100644
--- a/src/NewTools-Spotter/StFilterStringMatch.class.st
+++ b/src/NewTools-Spotter/StFilterStringMatch.class.st
@@ -2,12 +2,14 @@
 A filter that executes `String>>#match:` to each item to obtain matching items.
 "
 Class {
-	#name : #StFilterStringMatch,
-	#superclass : #StUnorderedFilter,
-	#category : #'NewTools-Spotter-Filters'
+	#name : 'StFilterStringMatch',
+	#superclass : 'StUnorderedFilter',
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterStringMatch >> isMatchedItem: anItem [
 	^ query match: (self itemFilterNameFor: anItem)
 ]
diff --git a/src/NewTools-Spotter/StFilterSubstring.class.st b/src/NewTools-Spotter/StFilterSubstring.class.st
index 2cf43736e..1c93a2e96 100644
--- a/src/NewTools-Spotter/StFilterSubstring.class.st
+++ b/src/NewTools-Spotter/StFilterSubstring.class.st
@@ -2,12 +2,14 @@
 A filter that seaerchs substrings to obtain matching items.
 "
 Class {
-	#name : #StFilterSubstring,
-	#superclass : #StOrderedFilter,
-	#category : #'NewTools-Spotter-Filters'
+	#name : 'StFilterSubstring',
+	#superclass : 'StOrderedFilter',
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterSubstring >> doApplyFilterWithQuery [
 	| exactMatches prefixMatches otherMatches nonExactMatches |
 
@@ -43,7 +45,7 @@ StFilterSubstring >> doApplyFilterWithQuery [
 	self filteredItems: exactMatches, nonExactMatches
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterSubstring >> indexForItemName: aString andQuery: aQueryString [
 	^ aString 
 		findString: aQueryString
@@ -51,7 +53,7 @@ StFilterSubstring >> indexForItemName: aString andQuery: aQueryString [
 		caseSensitive: self caseSensitive
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterSubstring >> queryForItem: each [
 	^ query " performance optimization "
 ]
diff --git a/src/NewTools-Spotter/StFilterSubstrings.class.st b/src/NewTools-Spotter/StFilterSubstrings.class.st
index 0dd162f03..5d1ffef51 100644
--- a/src/NewTools-Spotter/StFilterSubstrings.class.st
+++ b/src/NewTools-Spotter/StFilterSubstrings.class.st
@@ -2,20 +2,22 @@
 A filter that searches for substring to each item to obtain matching items.
 "
 Class {
-	#name : #StFilterSubstrings,
-	#superclass : #StUnorderedFilter,
+	#name : 'StFilterSubstrings',
+	#superclass : 'StUnorderedFilter',
 	#instVars : [
 		'separators'
 	],
-	#category : #'NewTools-Spotter-Filters'
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StFilterSubstrings >> defaultSeparators [
 	^ ' '
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterSubstrings >> isMatchedItem: anItem [
 	| itemName |
 	itemName := self itemFilterNameFor: anItem.
@@ -23,7 +25,7 @@ StFilterSubstrings >> isMatchedItem: anItem [
 		itemName includesSubstring: fragment caseSensitive: self caseSensitive ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StFilterSubstrings >> prepareFilterInContext: aSpotterContext [
 	super prepareFilterInContext: aSpotterContext.
 	
@@ -31,12 +33,12 @@ StFilterSubstrings >> prepareFilterInContext: aSpotterContext [
 	self query: (self query substrings: self separators) asSet asArray
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFilterSubstrings >> separators [
 	^ separators
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFilterSubstrings >> separators: anObject [
 	separators := anObject
 ]
diff --git a/src/NewTools-Spotter/StLimitArrived.class.st b/src/NewTools-Spotter/StLimitArrived.class.st
index a13adc800..8c42513bf 100644
--- a/src/NewTools-Spotter/StLimitArrived.class.st
+++ b/src/NewTools-Spotter/StLimitArrived.class.st
@@ -2,7 +2,9 @@
 Raises when the limit of candidates to find (defined in `StSpotterPragmaBasedProcessor class>>#defaultItemsLimit`) is reached.
 "
 Class {
-	#name : #StLimitArrived,
-	#superclass : #Warning,
-	#category : #'NewTools-Spotter-Filters'
+	#name : 'StLimitArrived',
+	#superclass : 'Warning',
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
diff --git a/src/NewTools-Spotter/StMethodEntry.extension.st b/src/NewTools-Spotter/StMethodEntry.extension.st
index 3a70c958b..ebd192a9f 100644
--- a/src/NewTools-Spotter/StMethodEntry.extension.st
+++ b/src/NewTools-Spotter/StMethodEntry.extension.st
@@ -1,12 +1,12 @@
-Extension { #name : #StMethodEntry }
+Extension { #name : 'StMethodEntry' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StMethodEntry >> headerCategoryForUnifiedProcessor: aLink on: aSpotterPresenter [
 
 	^ aSpotterPresenter headerCategoryUnifiedFor: aLink
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StMethodEntry class >> prepareUnifiedHeaderDescriptionFor: aHeaderPresenter [
 
 	^ aHeaderPresenter prepareAsImplementors
diff --git a/src/NewTools-Spotter/StNullFilter.class.st b/src/NewTools-Spotter/StNullFilter.class.st
index eb69622fd..d32428747 100644
--- a/src/NewTools-Spotter/StNullFilter.class.st
+++ b/src/NewTools-Spotter/StNullFilter.class.st
@@ -2,18 +2,20 @@
 A filter that answers all elements (not a filter at all)
 "
 Class {
-	#name : #StNullFilter,
-	#superclass : #StStringFilter,
-	#category : #'NewTools-Spotter-Filters'
+	#name : 'StNullFilter',
+	#superclass : 'StStringFilter',
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
 
-{ #category : #public }
+{ #category : 'public' }
 StNullFilter class >> stListFilter [
 
 	^ StFilterSubstring new
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StNullFilter >> doApplyFilterWithQuery [
 
 	self streamed 
@@ -31,7 +33,7 @@ StNullFilter >> doApplyFilterWithQuery [
 			self addItems: (self allItems first: (self itemsLimit min: self allItems size)) ]
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StNullFilter >> stListFilter [
 
 	^ StFilterSubstring new
diff --git a/src/NewTools-Spotter/StOrderedFilter.class.st b/src/NewTools-Spotter/StOrderedFilter.class.st
index fb89d7910..312c8a07d 100644
--- a/src/NewTools-Spotter/StOrderedFilter.class.st
+++ b/src/NewTools-Spotter/StOrderedFilter.class.st
@@ -2,7 +2,9 @@
 A base filter for ordered collections.
 "
 Class {
-	#name : #StOrderedFilter,
-	#superclass : #StStringFilter,
-	#category : #'NewTools-Spotter-Filters'
+	#name : 'StOrderedFilter',
+	#superclass : 'StStringFilter',
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
diff --git a/src/NewTools-Spotter/StPackageEntry.extension.st b/src/NewTools-Spotter/StPackageEntry.extension.st
index 18fac2512..717252c5c 100644
--- a/src/NewTools-Spotter/StPackageEntry.extension.st
+++ b/src/NewTools-Spotter/StPackageEntry.extension.st
@@ -1,12 +1,12 @@
-Extension { #name : #StPackageEntry }
+Extension { #name : 'StPackageEntry' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StPackageEntry >> headerCategoryForUnifiedProcessor: aLink on: aSpotterPresenter [
 
 	^ aSpotterPresenter headerCategoryUnifiedFor: aLink
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StPackageEntry class >> prepareUnifiedHeaderDescriptionFor: aHeaderPresenter [
 
 	^ aHeaderPresenter prepareAsPackages
diff --git a/src/NewTools-Spotter/StSpotter.class.st b/src/NewTools-Spotter/StSpotter.class.st
index 07a13a8cf..b740ba019 100644
--- a/src/NewTools-Spotter/StSpotter.class.st
+++ b/src/NewTools-Spotter/StSpotter.class.st
@@ -19,8 +19,8 @@ Some known processors and options are:
 - Press <meta+n>
 "
 Class {
-	#name : #StSpotter,
-	#superclass : #StPresenter,
+	#name : 'StSpotter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'searchText',
 		'resultList',
@@ -45,16 +45,18 @@ Class {
 	#classInstVars : [
 		'spotter'
 	],
-	#category : #'NewTools-Spotter-View'
+	#category : 'NewTools-Spotter-View',
+	#package : 'NewTools-Spotter',
+	#tag : 'View'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter class >> basicHistory [
 
 	^ History ifNil: [ History := WeakOrderedCollection new ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter class >> createTips [
 
 	^ {
@@ -75,21 +77,21 @@ StSpotter class >> createTips [
 	}
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotter class >> hidePreview [
 	<script>
 
 	PreviewVisible := false
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotter class >> hideTips [
 	<script>
 
 	TipsVisible := false
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter class >> historize: aCandidateLink [
 
 	self basicHistory 
@@ -97,13 +99,13 @@ StSpotter class >> historize: aCandidateLink [
 		addFirst: aCandidateLink
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotter class >> history [
 
 	^ self basicHistory reject: [ :each | each isNil ]
 ]
 
-{ #category : #'class initialization' }
+{ #category : 'class initialization' }
 StSpotter class >> initialize [
 
 	self showPreview.
@@ -111,31 +113,31 @@ StSpotter class >> initialize [
 	self insertsSelection: true.
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotter class >> insertsSelection [
 		
 	^ InsertsSelection ifNil: [ InsertsSelection := false ]
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotter class >> insertsSelection: aBoolean [
 		
 	InsertsSelection := aBoolean
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotter class >> isShowingPreview [
 
 	^ PreviewVisible
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotter class >> isShowingTips [
 
 	^ TipsVisible
 ]
 
-{ #category : #'world menu' }
+{ #category : 'world menu' }
 StSpotter class >> menuCommandOn: aBuilder [
 	<worldMenu>
 	(aBuilder item: #Spotter)
@@ -147,13 +149,13 @@ StSpotter class >> menuCommandOn: aBuilder [
 		iconName: #smallFind
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSpotter class >> open [
 
 	self openWithText: ''
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSpotter class >> openOn: aModel [
 
 	self reset.
@@ -161,13 +163,13 @@ StSpotter class >> openOn: aModel [
 	^ spotter openModal
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSpotter class >> openOnOrigin: anObject [
 
 	^ self openOn: (StSpotterModel newOrigin: anObject)
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSpotter class >> openWithText: aText [
 
 	self reset.
@@ -178,26 +180,26 @@ StSpotter class >> openWithText: aText [
 	^ spotter openModal
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotter class >> previewVisible [
 		
 	^ PreviewVisible
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotter class >> previewVisible: aBoolean [
 	
 	PreviewVisible := aBoolean
 ]
 
-{ #category : #'tools registry' }
+{ #category : 'tools registry' }
 StSpotter class >> registerToolsOn: registry [
 	"self registerToolsOn: Smalltalk tools"
 
 	registry register: self as: #spotter
 ]
 
-{ #category : #'class initialization' }
+{ #category : 'class initialization' }
 StSpotter class >> reset [
 	
 	spotter ifNotNil: [ 
@@ -205,7 +207,7 @@ StSpotter class >> reset [
 		spotter := nil ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotter class >> resetHistory [
 	<script>
 	"
@@ -214,7 +216,7 @@ StSpotter class >> resetHistory [
 	History := nil
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotter class >> settingsOn: aBuilder [
 	<systemsettings>
 
@@ -245,52 +247,52 @@ StSpotter class >> settingsOn: aBuilder [
 		label: 'Inserts Selection'.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotter class >> showPreview [
 	<script>
 	
 	PreviewVisible := true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotter class >> showTips [
 	<script>
 	
 	TipsVisible := true
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter class >> tips [ 
 
 	^ Tips ifNil: [ Tips := self createTips ]
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotter class >> tipsVisible [
 		
 	^ TipsVisible
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StSpotter class >> tipsVisible: aBoolean [
 		
 	TipsVisible := aBoolean
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter class >> windowClosed [
 
 	spotter := nil
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotter >> activate: aPresenter [
 
 	aPresenter ifNil: [ ^ self ].
 	aPresenter activateOn: self
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotter >> activateLink: aCandidateLink [
 
 	self window close.
@@ -298,7 +300,7 @@ StSpotter >> activateLink: aCandidateLink [
 	aCandidateLink value evaluateFor: self
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotter >> addPreviewPanelTo: contentsLayout [
 
 	contentsLayout 	add: (previewContainer := SpBoxLayout newTopToBottom).
@@ -306,7 +308,7 @@ StSpotter >> addPreviewPanelTo: contentsLayout [
 		self showPreview: selection selectedItem ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotter >> addTipsPanel [ 
 
 	self layout: (SpBoxLayout newTopToBottom
@@ -335,7 +337,7 @@ StSpotter >> addTipsPanel [
 		yourself)
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> allowUIToDraw [
 
 	"5 is a magic number we tested is enough to allow the UI to display the spotter"
@@ -343,7 +345,7 @@ StSpotter >> allowUIToDraw [
 
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> configureModel: aModel [ 
 
 	aModel 
@@ -356,7 +358,7 @@ StSpotter >> configureModel: aModel [
 		whenQueryEndedDo: [ self hideSpinner ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> defaultModel [
 
 	^ self newModel
@@ -364,7 +366,7 @@ StSpotter >> defaultModel [
 		yourself
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotter >> diveInProcessor: aProcessor [
 
 	self model schedule: [
@@ -376,7 +378,7 @@ StSpotter >> diveInProcessor: aProcessor [
 		searchText text: '' ]
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotter >> diveOut [
 
 	self resetLastSelectedEntry.
@@ -387,14 +389,14 @@ StSpotter >> diveOut [
 		searchText cursorPositionIndex: aString size + 1 ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSpotter >> feedTip [
 	
 	tip ifNil: [ ^ self ].
 	tip label: self class tips atRandom
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 StSpotter >> flushPendingUpdates [
 
 	self defer: [ 
@@ -411,14 +413,14 @@ StSpotter >> flushPendingUpdates [
 							ifFalse: [ e pass ] ] ] ] ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> handleKeyEvent: anEvent [
 	
 	(#( 30 "arrow up" 31 "arrow down" 13 "cr") includes: anEvent keyCharacter asInteger)
 		ifFalse: [ searchText takeKeyboardFocus ]
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 StSpotter >> headerCategoryFor: aLink [
 
 	^ categories 
@@ -426,7 +428,7 @@ StSpotter >> headerCategoryFor: aLink [
 		ifAbsentPut: [ self newSpotterHeaderPresenter: aLink processor ]
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 StSpotter >> headerCategoryUnifiedFor: aLink [
 
 	^ categories 
@@ -437,19 +439,19 @@ StSpotter >> headerCategoryUnifiedFor: aLink [
 				yourself ]
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotter >> hideSpinner [
 
 	self defer: [ spinner hide ]
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotter >> historize: aCandidateLink [
 
 	self class historize: aCandidateLink
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotter >> initialExtent [
 
 	self flag: #TODO. "Maybe calculate coordinates?"
@@ -458,7 +460,7 @@ StSpotter >> initialExtent [
 		ifFalse: [ (500@450) scaledByDisplayScaleFactor ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotter >> initialize [
 
 	mutex ifNil: [ mutex := Mutex new ].
@@ -468,13 +470,13 @@ StSpotter >> initialize [
 	super initialize
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotter >> initializeDialogWindow: aDialogWindowPresenter [
  
 	aDialogWindowPresenter closeOnBackdropClick: true
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotter >> initializeLayout [
 	| contentsLayout |
 
@@ -497,7 +499,7 @@ StSpotter >> initializeLayout [
 	self isShowingTips ifTrue: [ self addTipsPanel ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotter >> initializePresenters [
 
 	resultList := self newComponentList.
@@ -539,7 +541,7 @@ StSpotter >> initializePresenters [
 			toAction: [ self maybeActivateFirstElementOfResultList ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotter >> initializeWindow: aWindowPresenter [
 
 	super initializeWindow: aWindowPresenter.
@@ -561,25 +563,25 @@ StSpotter >> initializeWindow: aWindowPresenter [
 			onExecution: [ :aProcessor | self updateSearchFromProcessor: aProcessor ] ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotter >> insertsSelection [
 
 	^ self class insertsSelection
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotter >> isShowingPreview [
 
 	^ self class isShowingPreview
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotter >> isShowingTips [
 
 	^ self class isShowingTips
 ]
 
-{ #category : #'private - processing' }
+{ #category : 'private - processing' }
 StSpotter >> keepLastSelectedEntry [
 	"When starting a process (a new query), it may happen that I have already a selection on the 
 	 result list. Since my new query may be a refination (or expansion) of an existing search. 
@@ -593,7 +595,7 @@ StSpotter >> keepLastSelectedEntry [
 		ifNotNil: [ :aPresenter | aPresenter model value ]
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotter >> maybeActivateFirstElementOfResultList [
 	"| text |
 
@@ -605,25 +607,25 @@ StSpotter >> maybeActivateFirstElementOfResultList [
 	self activate: resultList selectedItem 
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StSpotter >> model [
 
 	^ model ifNil: [ model := self defaultModel ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> newModel [
 		
 	^ StSpotterModel new
 ]
 
-{ #category : #'private - factory' }
+{ #category : 'private - factory' }
 StSpotter >> newSpotterCandidateLinkPresenter: aLink [
 
 	^ self instantiate: StSpotterCandidateLinkPresenter on: aLink
 ]
 
-{ #category : #'private - factory' }
+{ #category : 'private - factory' }
 StSpotter >> newSpotterHeaderPresenter: aProcessor [
 
 	^ (self instantiate: StSpotterHeaderPresenter on: aProcessor)
@@ -633,7 +635,7 @@ StSpotter >> newSpotterHeaderPresenter: aProcessor [
 		yourself
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 StSpotter >> nextSelectablePresenter: selectedPresenter oldPresenters: oldPresenters newPresenters: newPresenters [
 
 	"look for current selected presenter"	
@@ -660,7 +662,7 @@ StSpotter >> nextSelectablePresenter: selectedPresenter oldPresenters: oldPresen
 	^ nil
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSpotter >> openFinder [
 
 	self window close.
@@ -668,13 +670,13 @@ StSpotter >> openFinder [
 	FinderUI open
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> previewContainer [
 
 	^ previewContainer
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 StSpotter >> queuedUpdateResultList [
 	| categoryPresenter presenters selectedPresenter |
 
@@ -708,7 +710,7 @@ StSpotter >> queuedUpdateResultList [
 		updating := false ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> removeAll [
 
 	mutex critical: [ queue removeAll ]. 
@@ -716,26 +718,26 @@ StSpotter >> removeAll [
 	self allowUIToDraw
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> removeAllResults [
 
 	resultList presenters: #().
 	self removeAll
 ]
 
-{ #category : #'private - processing' }
+{ #category : 'private - processing' }
 StSpotter >> resetLastSelectedEntry [
 	
 	lastSelectedEntry := nil
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> searchText [
 
 	^ searchText
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotter >> searchingString [
 	| searchString searchChunks |
 	
@@ -746,14 +748,14 @@ StSpotter >> searchingString [
 		ifFalse: [ searchString ]
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StSpotter >> setModelBeforeInitialization: aSpotterModel [
 
 	model := aSpotterModel.
 	self configureModel: model
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotter >> showPreview: aPresenter [
 
 	previewContainer removeAll.
@@ -766,7 +768,7 @@ StSpotter >> showPreview: aPresenter [
 					 yourself) ] ]
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotter >> showSpinner [
 
 	spinner isVisible ifTrue: [ ^ self ].
@@ -774,14 +776,14 @@ StSpotter >> showSpinner [
 		self defer: [ spinner show ]]
 ]
 
-{ #category : #processing }
+{ #category : 'processing' }
 StSpotter >> startNewProcess [
 
 	self keepLastSelectedEntry.
 	self removeAll
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> startProcessing [
 	"Start the process."
 
@@ -791,14 +793,14 @@ StSpotter >> startProcessing [
 	]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> stopProcessing [
 	"Start the process."
 
 	self model stopProcessing
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> transferFocusToResultList [
 	| index |
 
@@ -808,7 +810,7 @@ StSpotter >> transferFocusToResultList [
 		ifFalse: [ index ])
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> transferFocusToResultListAt: index [
 
 	resultList items isEmptyOrNil ifTrue: [ ^ self ].
@@ -818,13 +820,13 @@ StSpotter >> transferFocusToResultListAt: index [
 		takeKeyboardFocus
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> transferFocusToResultListAtLast [ 
 
 	self transferFocusToResultListAt: (resultList presenters size)
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> transferFocusToSearchTextArrowDown [
 
 	(resultList items notEmpty 
@@ -832,7 +834,7 @@ StSpotter >> transferFocusToSearchTextArrowDown [
 		ifTrue: [ searchText takeKeyboardFocus ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotter >> transferFocusToSearchTextArrowUp [
 
 	(resultList items notEmpty 
@@ -840,7 +842,7 @@ StSpotter >> transferFocusToSearchTextArrowUp [
 		ifTrue: [ searchText takeKeyboardFocus ]
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotter >> tryDiveIn [
 	| item |
 	
@@ -851,7 +853,7 @@ StSpotter >> tryDiveIn [
 	item diveIn
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotter >> tryDiveOut [
 	| item |
 	
@@ -862,13 +864,13 @@ StSpotter >> tryDiveOut [
 	item diveOut
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotter >> updatePresenter [
 
 	self feedTip
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 StSpotter >> updateResultList: aCandidateLink [
 
 	mutex critical: [ queue add: aCandidateLink ].
@@ -879,7 +881,7 @@ StSpotter >> updateResultList: aCandidateLink [
 	self flushPendingUpdates
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 StSpotter >> updateResultProcessor: processor amount: amount [
 
 	self defer: [ 
@@ -888,7 +890,7 @@ StSpotter >> updateResultProcessor: processor amount: amount [
 			ifPresent: [ :aPresenter | aPresenter finalAmount: amount ] ]
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 StSpotter >> updateSearch: aString [
 	
 	self model schedule: [
@@ -897,7 +899,7 @@ StSpotter >> updateSearch: aString [
 			on: self ]
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 StSpotter >> updateSearchFromProcessor: aProcessor [
 
 	searchText text: aProcessor query textInSearchBar.
diff --git a/src/NewTools-Spotter/StSpotterAllCandidatesAdded.class.st b/src/NewTools-Spotter/StSpotterAllCandidatesAdded.class.st
index f503cad71..6753500ce 100644
--- a/src/NewTools-Spotter/StSpotterAllCandidatesAdded.class.st
+++ b/src/NewTools-Spotter/StSpotterAllCandidatesAdded.class.st
@@ -2,20 +2,22 @@
 Announce all candidates has been found.
 "
 Class {
-	#name : #StSpotterAllCandidatesAdded,
-	#superclass : #StSpotterAnnouncement,
+	#name : 'StSpotterAllCandidatesAdded',
+	#superclass : 'StSpotterAnnouncement',
 	#instVars : [
 		'candidateLinks'
 	],
-	#category : #'NewTools-Spotter-Announcements'
+	#category : 'NewTools-Spotter-Announcements',
+	#package : 'NewTools-Spotter',
+	#tag : 'Announcements'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterAllCandidatesAdded >> candidateLinks [
 	^ candidateLinks
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterAllCandidatesAdded >> candidateLinks: anObject [
 	candidateLinks := anObject
 ]
diff --git a/src/NewTools-Spotter/StSpotterAnnouncement.class.st b/src/NewTools-Spotter/StSpotterAnnouncement.class.st
index 7e682bb6b..da81bb7d3 100644
--- a/src/NewTools-Spotter/StSpotterAnnouncement.class.st
+++ b/src/NewTools-Spotter/StSpotterAnnouncement.class.st
@@ -2,21 +2,23 @@
 A base announcement for spotter events.
 "
 Class {
-	#name : #StSpotterAnnouncement,
-	#superclass : #Announcement,
+	#name : 'StSpotterAnnouncement',
+	#superclass : 'Announcement',
 	#instVars : [
 		'category'
 	],
-	#category : #'NewTools-Spotter-Announcements'
+	#category : 'NewTools-Spotter-Announcements',
+	#package : 'NewTools-Spotter',
+	#tag : 'Announcements'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterAnnouncement >> category [
 	"Return the category (ie the kind of group of elements). This has nothing to do with class category."
 	^ category
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterAnnouncement >> category: anObject [
 	"Set the category (ie the kind of group of elements). This has nothing to do with class category."
 	category := anObject
diff --git a/src/NewTools-Spotter/StSpotterBasePresenter.class.st b/src/NewTools-Spotter/StSpotterBasePresenter.class.st
index 3779eec36..7a1f60ba0 100644
--- a/src/NewTools-Spotter/StSpotterBasePresenter.class.st
+++ b/src/NewTools-Spotter/StSpotterBasePresenter.class.st
@@ -2,30 +2,32 @@
 A base for presenters to be displayed as part of the spotter results list.
 "
 Class {
-	#name : #StSpotterBasePresenter,
-	#superclass : #SpPresenter,
-	#category : #'NewTools-Spotter-View'
+	#name : 'StSpotterBasePresenter',
+	#superclass : 'SpPresenter',
+	#category : 'NewTools-Spotter-View',
+	#package : 'NewTools-Spotter',
+	#tag : 'View'
 }
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSpotterBasePresenter >> activateOn: spotterPresenter [
 
 	self subclassResponsibility
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterBasePresenter >> isHeader [
 
 	^ false
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterBasePresenter >> matchesText: aString [ 
 	
 	self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterBasePresenter >> model [
 
 	^ self subclassResponsibility
diff --git a/src/NewTools-Spotter/StSpotterBlockIterator.class.st b/src/NewTools-Spotter/StSpotterBlockIterator.class.st
index 6b9e4621d..b36a131ad 100644
--- a/src/NewTools-Spotter/StSpotterBlockIterator.class.st
+++ b/src/NewTools-Spotter/StSpotterBlockIterator.class.st
@@ -3,27 +3,29 @@ Define an iterator on a block to be used to feed items to spotter.
 A block receives the `StSpotterBlockIterator>>#onDo:` event, to call when iterating on an element.
 "
 Class {
-	#name : #StSpotterBlockIterator,
-	#superclass : #StSpotterIterator,
+	#name : 'StSpotterBlockIterator',
+	#superclass : 'StSpotterIterator',
 	#instVars : [
 		'onDo'
 	],
-	#category : #'NewTools-Spotter-Iterators'
+	#category : 'NewTools-Spotter-Iterators',
+	#package : 'NewTools-Spotter',
+	#tag : 'Iterators'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterBlockIterator >> itemDo: aBlock [ 
 	self onDo 
 		cull: aBlock
 		cull: self context 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterBlockIterator >> onDo [
 	^ onDo ifNil: [ onDo := [ :anItemBlock :aContext | " do nothing " ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterBlockIterator >> onDo: anObject [
 	onDo := anObject
 ]
diff --git a/src/NewTools-Spotter/StSpotterCandidateAdded.class.st b/src/NewTools-Spotter/StSpotterCandidateAdded.class.st
index a3fb4686c..bc77b3e44 100644
--- a/src/NewTools-Spotter/StSpotterCandidateAdded.class.st
+++ b/src/NewTools-Spotter/StSpotterCandidateAdded.class.st
@@ -2,26 +2,28 @@
 Announce a new canditate has been found.
 "
 Class {
-	#name : #StSpotterCandidateAdded,
-	#superclass : #StSpotterAnnouncement,
+	#name : 'StSpotterCandidateAdded',
+	#superclass : 'StSpotterAnnouncement',
 	#instVars : [
 		'candidateLink'
 	],
-	#category : #'NewTools-Spotter-Announcements'
+	#category : 'NewTools-Spotter-Announcements',
+	#package : 'NewTools-Spotter',
+	#tag : 'Announcements'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateAdded >> candidate [
 	^ candidateLink value
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateAdded >> candidateLink [
 
 	^ candidateLink
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateAdded >> candidateLink: anObject [
 	candidateLink := anObject
 ]
diff --git a/src/NewTools-Spotter/StSpotterCandidateLink.class.st b/src/NewTools-Spotter/StSpotterCandidateLink.class.st
index 2d49e84a0..ac2c2c620 100644
--- a/src/NewTools-Spotter/StSpotterCandidateLink.class.st
+++ b/src/NewTools-Spotter/StSpotterCandidateLink.class.st
@@ -3,40 +3,42 @@ a link with a `StSpotterCandidateLink>>#candidate`.
 it is intended to work as element of a linked list.
 "
 Class {
-	#name : #StSpotterCandidateLink,
-	#superclass : #DoubleLink,
+	#name : 'StSpotterCandidateLink',
+	#superclass : 'DoubleLink',
 	#instVars : [
 		'processorLink',
 		'weight',
 		'renderingProcessorLink'
 	],
-	#category : #'NewTools-Spotter-Model'
+	#category : 'NewTools-Spotter-Model',
+	#package : 'NewTools-Spotter',
+	#tag : 'Model'
 }
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StSpotterCandidateLink >> < anotherCandidateLink [
 
 	^ self weight < anotherCandidateLink weight
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StSpotterCandidateLink >> > anotherCandidateLink [
 
 	^ self weight > anotherCandidateLink weight
 ]
 
-{ #category : #converting }
+{ #category : 'converting' }
 StSpotterCandidateLink >> asStSpotterCandidateLink [
 
 	^ self
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateLink >> candidate [
 	^ self value
 ]
 
-{ #category : #copying }
+{ #category : 'copying' }
 StSpotterCandidateLink >> copy [
 	| link |
 	
@@ -48,20 +50,20 @@ StSpotterCandidateLink >> copy [
 	^ link
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StSpotterCandidateLink >> displayStringOn: stream [
 
 	stream nextPutAll: 'Candidate link: '.
 	self value displayStringOn: stream 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterCandidateLink >> isFirst [
 
 	^ self previousLink processorLink ~= self processorLink
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterCandidateLink >> matchesText: aString [
 	
 	^ self value 
@@ -69,40 +71,40 @@ StSpotterCandidateLink >> matchesText: aString [
 		ifNil: [ false ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateLink >> next [
 	^ self nextLink
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateLink >> previous [
 	^ self previousLink
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidateLink >> privateProcessorLink: aLink [
 
 	processorLink := aLink
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidateLink >> privateRenderingProcessorLink: aLink [
 
 	renderingProcessorLink := aLink
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateLink >> processor [
 
 	^ self processorLink value
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateLink >> processorLink [
 	^ processorLink
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateLink >> processorLink: anObject [
 
 	"we set rendering processor only if one is not set. it allows to have a collection of items,
@@ -113,14 +115,14 @@ StSpotterCandidateLink >> processorLink: anObject [
 	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateLink >> renderingProcessor [
 
 	renderingProcessorLink ifNil: [ self renderingProcessor: processorLink ].
 	^ renderingProcessorLink value
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateLink >> renderingProcessor: aProcessorLink [
 
 	renderingProcessorLink ifNil: [ 
@@ -128,13 +130,13 @@ StSpotterCandidateLink >> renderingProcessor: aProcessorLink [
 	processorLink ifNil: [ processorLink := aProcessorLink ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateLink >> weight [
 
 	^ weight
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateLink >> weight: anObject [ 
 
 	weight := anObject
diff --git a/src/NewTools-Spotter/StSpotterCandidateLinkPresenter.class.st b/src/NewTools-Spotter/StSpotterCandidateLinkPresenter.class.st
index 0e5328a96..469dee38b 100644
--- a/src/NewTools-Spotter/StSpotterCandidateLinkPresenter.class.st
+++ b/src/NewTools-Spotter/StSpotterCandidateLinkPresenter.class.st
@@ -3,29 +3,31 @@ A presenter to show a candidate (an option that can be choosen).
 
 "
 Class {
-	#name : #StSpotterCandidateLinkPresenter,
-	#superclass : #StSpotterBasePresenter,
+	#name : 'StSpotterCandidateLinkPresenter',
+	#superclass : 'StSpotterBasePresenter',
 	#instVars : [
 		'iconPresenter',
 		'labelPresenter',
 		'model'
 	],
-	#category : #'NewTools-Spotter-View'
+	#category : 'NewTools-Spotter-View',
+	#package : 'NewTools-Spotter',
+	#tag : 'View'
 }
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSpotterCandidateLinkPresenter >> activateOn: spotterPresenter [
 
 	spotterPresenter activateLink: self model
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidateLinkPresenter >> entry [
 
 	^ self model value
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterCandidateLinkPresenter >> initializePresenters [
 
 	self layout: (SpBoxLayout newLeftToRight
@@ -39,7 +41,7 @@ StSpotterCandidateLinkPresenter >> initializePresenters [
 	self addStyle: 'stSpotterLink'
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterCandidateLinkPresenter >> matchesText: aString [
 
 	^ self model 
@@ -47,19 +49,19 @@ StSpotterCandidateLinkPresenter >> matchesText: aString [
 		ifNil: [ false ]
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StSpotterCandidateLinkPresenter >> model [
 
 	^ model
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StSpotterCandidateLinkPresenter >> setModelBeforeInitialization: aCandidateLink [
 
 	model := aCandidateLink
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterCandidateLinkPresenter >> updatePresenter [
 
 	self entry ifNil: [ ^ self ]. 
diff --git a/src/NewTools-Spotter/StSpotterCandidatesAmountChanged.class.st b/src/NewTools-Spotter/StSpotterCandidatesAmountChanged.class.st
index 3e270d949..d424d5972 100644
--- a/src/NewTools-Spotter/StSpotterCandidatesAmountChanged.class.st
+++ b/src/NewTools-Spotter/StSpotterCandidatesAmountChanged.class.st
@@ -2,21 +2,23 @@
 Announces the ammount of candidates found changed.
 "
 Class {
-	#name : #StSpotterCandidatesAmountChanged,
-	#superclass : #StSpotterAnnouncement,
+	#name : 'StSpotterCandidatesAmountChanged',
+	#superclass : 'StSpotterAnnouncement',
 	#instVars : [
 		'amount'
 	],
-	#category : #'NewTools-Spotter-Announcements'
+	#category : 'NewTools-Spotter-Announcements',
+	#package : 'NewTools-Spotter',
+	#tag : 'Announcements'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesAmountChanged >> amount [
 
 	^ amount
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesAmountChanged >> amount: anObject [
 
 	amount := anObject
diff --git a/src/NewTools-Spotter/StSpotterCandidatesList.class.st b/src/NewTools-Spotter/StSpotterCandidatesList.class.st
index 967686336..0fc53d561 100644
--- a/src/NewTools-Spotter/StSpotterCandidatesList.class.st
+++ b/src/NewTools-Spotter/StSpotterCandidatesList.class.st
@@ -2,8 +2,8 @@
 Maintains a list of candidates (results of a `StSpotterQuery`).
 "
 Class {
-	#name : #StSpotterCandidatesList,
-	#superclass : #Object,
+	#name : 'StSpotterCandidatesList',
+	#superclass : 'Object',
 	#instVars : [
 		'categories',
 		'candidates',
@@ -11,10 +11,12 @@ Class {
 		'processorLinksMap',
 		'count'
 	],
-	#category : #'NewTools-Spotter-Model'
+	#category : 'NewTools-Spotter-Model',
+	#package : 'NewTools-Spotter',
+	#tag : 'Model'
 }
 
-{ #category : #'adding/removing' }
+{ #category : 'adding/removing' }
 StSpotterCandidatesList >> addAllCandidates: aCollection in: aProcessor [
 	| allLinks |
 	
@@ -33,7 +35,7 @@ StSpotterCandidatesList >> addAllCandidates: aCollection in: aProcessor [
 		yourself)
 ]
 
-{ #category : #'adding/removing' }
+{ #category : 'adding/removing' }
 StSpotterCandidatesList >> addCandidate: anObjectOrLink in: aProcessor [
 	"before adding candidates we need to define all categories, because their order is important"
 	| processorLink candidateLink |
@@ -55,7 +57,7 @@ StSpotterCandidatesList >> addCandidate: anObjectOrLink in: aProcessor [
 	^ candidateLink
 ]
 
-{ #category : #'adding/removing' }
+{ #category : 'adding/removing' }
 StSpotterCandidatesList >> addProcessor: aProcessor [
 	| processorLink |
 	
@@ -67,18 +69,18 @@ StSpotterCandidatesList >> addProcessor: aProcessor [
 	^ processorLink
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesList >> announcer [
 	^ announcer ifNil: [ announcer := Announcer new ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesList >> candidates [
 
 	^ candidates ifNil: [ candidates := DoubleLinkedList new ]
 ]
 
-{ #category : #candidates }
+{ #category : 'candidates' }
 StSpotterCandidatesList >> getCandidateLink: aCandiate in: aProcessor [
 	"returns a corresponding candidateLink, that belongs to a processor"
 	(self getCandidateLinks: (self getProcessorLink: aProcessor))
@@ -88,7 +90,7 @@ StSpotterCandidatesList >> getCandidateLink: aCandiate in: aProcessor [
 	
 ]
 
-{ #category : #candidates }
+{ #category : 'candidates' }
 StSpotterCandidatesList >> getCandidateLinks: aProcessorLink [
 	"returns all candidate links that belongs to a processor link"
 	| list head tail current |
@@ -111,45 +113,45 @@ StSpotterCandidatesList >> getCandidateLinks: aProcessorLink [
 	^ list
 ]
 
-{ #category : #processors }
+{ #category : 'processors' }
 StSpotterCandidatesList >> getProcessorLink: aProcessor [
 
 	^ self processorLinksMap at: aProcessor ifAbsentPut: [ self addProcessor: aProcessor ]
 ]
 
-{ #category : #processors }
+{ #category : 'processors' }
 StSpotterCandidatesList >> getProcessorLinkByCandidateLink: aCandidateLink [
 
 	^ aCandidateLink processorLink
 ]
 
-{ #category : #candidates }
+{ #category : 'candidates' }
 StSpotterCandidatesList >> head [
 
 	^ self candidates head
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterCandidatesList >> initialize [
 
 	super initialize.
 	count := 0
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterCandidatesList >> isEmpty [
 	"Return true if there are no candidates in the list, false otherwise"
 	^ self candidates isEmpty
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterCandidatesList >> isNotEmpty [
 	"Return true if there is at least one candidate in the list, false otherwise"
 
 	^ self candidates isNotEmpty
 ]
 
-{ #category : #processors }
+{ #category : 'processors' }
 StSpotterCandidatesList >> nextProcessorLinkOf: aProcessorLink [
 	"returns next processor link, that has more than zero candidates.
 	if passed processor is the last one, will continue searching from the beginning"
@@ -168,13 +170,13 @@ StSpotterCandidatesList >> nextProcessorLinkOf: aProcessorLink [
 	^ aProcessorLink
 ]
 
-{ #category : #notifying }
+{ #category : 'notifying' }
 StSpotterCandidatesList >> notifyAllCandidatesRemoved [
 
 	"self announcer announce: (GTSpotterAllCandidatesRemoved new)"
 ]
 
-{ #category : #notifying }
+{ #category : 'notifying' }
 StSpotterCandidatesList >> notifyCandidateAdded: aCandidateLink in: aProcessor [
 
 	self announcer announce: (StSpotterCandidateAdded new 
@@ -183,7 +185,7 @@ StSpotterCandidatesList >> notifyCandidateAdded: aCandidateLink in: aProcessor [
 		yourself).
 ]
 
-{ #category : #'stream handling' }
+{ #category : 'stream handling' }
 StSpotterCandidatesList >> onAmountChanged: anInteger in: aProcessor [
 	"Amount must be non-negative"
 	"If amount is not positive there is no need to do anything"
@@ -195,7 +197,7 @@ StSpotterCandidatesList >> onAmountChanged: anInteger in: aProcessor [
 		yourself)
 ]
 
-{ #category : #processors }
+{ #category : 'processors' }
 StSpotterCandidatesList >> previousProcessorLinkOf: aProcessorLink [
 	"returns previous processor link, that has more than zero candidates.
 	if passed processor is the first one, will continue searching from the end"
@@ -215,7 +217,7 @@ StSpotterCandidatesList >> previousProcessorLinkOf: aProcessorLink [
 	
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesList >> privateAddCandidate: aCandidateLink inEmpty: aProcessorLink [
 	| head current |
 	current := aProcessorLink.	"not nil"
@@ -238,7 +240,7 @@ StSpotterCandidatesList >> privateAddCandidate: aCandidateLink inEmpty: aProcess
 	^ aCandidateLink
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesList >> privateAddCandidate: aCandidateLink inNotEmpty: aProcessorLink [
 	
 	"aCandidateLink weight
@@ -251,7 +253,7 @@ StSpotterCandidatesList >> privateAddCandidate: aCandidateLink inNotEmpty: aProc
 	^ aCandidateLink
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesList >> privateAddCandidate: aCandidateLink weightedIn: aProcessorLink [
 
 	^ aProcessorLink isFull
@@ -259,13 +261,13 @@ StSpotterCandidatesList >> privateAddCandidate: aCandidateLink weightedIn: aProc
 		ifFalse: [ self privateAddCandidate: aCandidateLink weightedInNotFull: aProcessorLink ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesList >> privateAddCandidate: aCandidateLink weightedInFull: aProcessorLink [
 
 	
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterCandidatesList >> privateAddCandidate: aCandidateLink weightedInNotFull: aProcessorLink [
 	| head tail |
 	
@@ -282,32 +284,32 @@ StSpotterCandidatesList >> privateAddCandidate: aCandidateLink weightedInNotFull
 				ifTrue: [  ] ]
 ]
 
-{ #category : #notifying }
+{ #category : 'notifying' }
 StSpotterCandidatesList >> processorEnded: aProcessor [
 
 	self announcer announce: (StSpotterProcessorEnded newProcessor: self)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesList >> processorLinksMap [
 
 	^ processorLinksMap ifNil: [ processorLinksMap := Dictionary new ]
 	
 ]
 
-{ #category : #notifying }
+{ #category : 'notifying' }
 StSpotterCandidatesList >> processorStarted: aProcessor [
 
 	self announcer announce: (StSpotterProcessorStarted newProcessor: self)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterCandidatesList >> processors [
 
 	^ categories ifNil: [ categories := DoubleLinkedList new ].
 ]
 
-{ #category : #'adding/removing' }
+{ #category : 'adding/removing' }
 StSpotterCandidatesList >> removeAllCandidates [
 
 	self processors linksDo: [ :each | each clear ].
@@ -315,7 +317,7 @@ StSpotterCandidatesList >> removeAllCandidates [
 	self notifyAllCandidatesRemoved
 ]
 
-{ #category : #'adding/removing' }
+{ #category : 'adding/removing' }
 StSpotterCandidatesList >> removeAllCandidatesOf: aProcessor [
 	| processorLink head tail current |
 	
@@ -346,7 +348,7 @@ StSpotterCandidatesList >> removeAllCandidatesOf: aProcessor [
 	
 ]
 
-{ #category : #candidates }
+{ #category : 'candidates' }
 StSpotterCandidatesList >> stTail [
 
 	^ self candidates stTail
diff --git a/src/NewTools-Spotter/StSpotterContext.class.st b/src/NewTools-Spotter/StSpotterContext.class.st
index bc1972d99..72dd0d3ac 100644
--- a/src/NewTools-Spotter/StSpotterContext.class.st
+++ b/src/NewTools-Spotter/StSpotterContext.class.st
@@ -3,8 +3,8 @@ Defines the context execution of a `StSpotterQuery`.
 It has the `StSpotterContext>>#text` that is being searched and the `StSpotterContext>>#stream` for it. 
 "
 Class {
-	#name : #StSpotterContext,
-	#superclass : #Object,
+	#name : 'StSpotterContext',
+	#superclass : 'Object',
 	#instVars : [
 		'step',
 		'stream',
@@ -18,10 +18,12 @@ Class {
 		'cache',
 		'continuing'
 	],
-	#category : #'NewTools-Spotter-Model'
+	#category : 'NewTools-Spotter-Model',
+	#package : 'NewTools-Spotter',
+	#tag : 'Model'
 }
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterContext >> addItem: anObject [
 
 	self stream 
@@ -29,7 +31,7 @@ StSpotterContext >> addItem: anObject [
 		inProcessor: self processor
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterContext >> addItems: aCollection [
 
 	self stream 
@@ -37,37 +39,37 @@ StSpotterContext >> addItems: aCollection [
 		inProcessor: self processor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> cache [
 	^ cache
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> cache: anObject [
 	cache := anObject
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterContext >> cacheAt: aSymbol [
 	^ self cacheAt: aSymbol ifAbsent: [ nil ]
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterContext >> cacheAt: aSymbol ifAbsent: aBlock [
 	^ self cache at: aSymbol ifAbsent: aBlock
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterContext >> cacheAt: aSymbol ifAbsentPut: aBlock [
 	^ self cache at: aSymbol ifAbsentPut: aBlock
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterContext >> cacheAt: aSymbol put: anObject [
 	^ self cache at: aSymbol put: anObject
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterContext >> canContinue [
 	 " divein / really ugly, spotter-step does not really know why it was created or where it comes from :( "
 	" another hack: diveIncategory must never continue because it just streams all items from the previous step. continuing in diveInCategory would duplicate all items! " 
@@ -75,7 +77,7 @@ StSpotterContext >> canContinue [
 		or: [ self step event isNil ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterContext >> continueFilter [
 	| processors nonEmptyProcessors |
 	processors := self cache at: #processorsAndFilters ifAbsent: [ ^ self ].
@@ -88,17 +90,17 @@ StSpotterContext >> continueFilter [
 			assoc key continueFilterInContext: self ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> continuing [
 	^ continuing
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> continuing: anObject [
 	continuing := anObject
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterContext >> defaultCache [
 	^ IdentityDictionary new 
 		at: #processorsAndFilters put: (IdentityDictionary new: 100); " not a limitation, just a reasonable start size "
@@ -106,27 +108,27 @@ StSpotterContext >> defaultCache [
 		yourself
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterContext >> defaultContinuing [
 	^ false
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterContext >> defaultText [
 	^ ''
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterContext >> defaultTextLowercase [
 	^ self textTrimmed asLowercase
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterContext >> defaultTextTrimmed [
 	^ self text trimBoth
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterContext >> doContinueFilterForProcessor: aGTProcessor [
 	self processor: aGTProcessor.
 	self filter: ((self cache at: #processorsAndFilters) at: aGTProcessor).
@@ -135,7 +137,7 @@ StSpotterContext >> doContinueFilterForProcessor: aGTProcessor [
 	^ aGTProcessor withItemsLimit: aGTProcessor continueItemsLimit do: [ filter value: self ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterContext >> doFilter: aFilter forProcessor: aProcessor [
 
 	self processor: aProcessor.
@@ -147,23 +149,23 @@ StSpotterContext >> doFilter: aFilter forProcessor: aProcessor [
 	^ aFilter value: self
 ]
 
-{ #category : #comparing }
+{ #category : 'comparing' }
 StSpotterContext >> equals: aContext [
 	aContext ifNil: [ ^ false ].
    ^ self matches: aContext search
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> filter [
 	^ filter
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> filter: anObject [
 	filter := anObject
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterContext >> initialize [
 	super initialize.
 	
@@ -172,117 +174,117 @@ StSpotterContext >> initialize [
 	continuing := self defaultContinuing.
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterContext >> isContinuing [
 	^ self continuing 
 		and: [ self streamed isEmptyOrNil not 
 			and: [ self canContinue ] ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterContext >> isEmpty [
 	^ self text isNil
 		or: [ self textTrimmed isEmpty ]
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterContext >> itemsLimit [
 	^ self processor itemsLimit
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterContext >> matches: aString [
 	^ self isEmpty not
 		and: [ self search = aString ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterContext >> notEmpty [
 	^ self isEmpty not
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> processor [
 	^ processor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> processor: anObject [
 	processor := anObject
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterContext >> removeCacheAt: aSymbol [
 	^ self cache removeKey: aSymbol ifAbsent: [ nil ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> search [
 	^ search
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> search: anObject [
 	" search stores the fully entered text (including categories) "
 	search := anObject
 ]
 
-{ #category : #'accessing - dynamic' }
+{ #category : 'accessing - dynamic' }
 StSpotterContext >> spotter [
 	^ self step spotter
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> step [
 	^ step
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> step: anObject [
 	step := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> stream [
 	^ stream
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> stream: anObject [
 	stream := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> streamed [
 	^ streamed
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> streamed: anObject [
 	streamed := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> text [
 	^ text
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterContext >> text: anObject [
 	text := anObject ifNil: [ self defaultText ]
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterContext >> textLowercase [
 	^ textLowercase ifNil: [ textLowercase := self defaultTextLowercase ]
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterContext >> textTrimmed [
 	^ textTrimmed ifNil: [ textTrimmed := self defaultTextTrimmed ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterContext >> withContinue: aBoolean do: aBlock [
 	| previousContinuing |
 	previousContinuing := continuing.
diff --git a/src/NewTools-Spotter/StSpotterHeaderPresenter.class.st b/src/NewTools-Spotter/StSpotterHeaderPresenter.class.st
index 3b4aebd64..2f61e3a34 100644
--- a/src/NewTools-Spotter/StSpotterHeaderPresenter.class.st
+++ b/src/NewTools-Spotter/StSpotterHeaderPresenter.class.st
@@ -5,8 +5,8 @@ Each group has a list of children (instances of *StSpotterCandidateListPresenter
 
 "
 Class {
-	#name : #StSpotterHeaderPresenter,
-	#superclass : #StSpotterBasePresenter,
+	#name : 'StSpotterHeaderPresenter',
+	#superclass : 'StSpotterBasePresenter',
 	#instVars : [
 		'model',
 		'candidatePresentersList',
@@ -20,37 +20,39 @@ Class {
 		'diveOutAction',
 		'nested'
 	],
-	#category : #'NewTools-Spotter-View'
+	#category : 'NewTools-Spotter-View',
+	#package : 'NewTools-Spotter',
+	#tag : 'View'
 }
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSpotterHeaderPresenter >> activateOn: spotterPresenter [
 
 	self doDive
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterHeaderPresenter >> addCandidate: aCandidateLink inSpotter: spotterPresenter [
 
 	candidatePresentersList add: (spotterPresenter newSpotterCandidateLinkPresenter: aCandidateLink).
 	self updateAmount
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotterHeaderPresenter >> diveIn [
 
 	diveInAction ifNil: [ ^ self ].
 	diveInAction cull: self model
 ]
 
-{ #category : #'private - actions' }
+{ #category : 'private - actions' }
 StSpotterHeaderPresenter >> diveOut [
 
 	diveOutAction ifNil: [ ^ self ].
 	diveOutAction cull: self model
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSpotterHeaderPresenter >> doDive [
 
 	nested 
@@ -58,25 +60,25 @@ StSpotterHeaderPresenter >> doDive [
 		ifFalse: [ self diveIn ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterHeaderPresenter >> finalAmount [
 
 	^ finalAmount
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterHeaderPresenter >> finalAmount: aNumber [
 
 	finalAmount := aNumber
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterHeaderPresenter >> includesLink: aLink [
 
 	^ candidatePresentersList anySatisfy: [ :each | each entry = aLink value ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterHeaderPresenter >> initialize [
 
 	candidatePresentersList := OrderedCollection new.
@@ -84,7 +86,7 @@ StSpotterHeaderPresenter >> initialize [
 	super initialize
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterHeaderPresenter >> initializePresenters [
 
 	self layout: (SpBoxLayout newLeftToRight
@@ -106,25 +108,25 @@ StSpotterHeaderPresenter >> initializePresenters [
 			event isPrimaryButton ifTrue: [ self doDive ] ].
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterHeaderPresenter >> isHeader [
 
 	^ true
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterHeaderPresenter >> matchesText: aString [
 
 	^ false
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StSpotterHeaderPresenter >> model [
 
 	^ model
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterHeaderPresenter >> nested: aBoolean [
 
 	nested = aBoolean ifTrue: [ ^ self ].
@@ -135,20 +137,20 @@ StSpotterHeaderPresenter >> nested: aBoolean [
 		ifFalse: [ #smallForward ]))
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterHeaderPresenter >> order [
 
 	^ order ifNil: [ self model order ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterHeaderPresenter >> prepareAsClasses [
 
 	labelPresenter label: self model labelForClasses.
 	helpLabelPresenter label: (self model keyBindingForClasses acceptVisitor: OSPlatform current shortcutPrinter).
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterHeaderPresenter >> prepareAsImplementors [
 
 	order := self model order + 1.
@@ -156,7 +158,7 @@ StSpotterHeaderPresenter >> prepareAsImplementors [
 	helpLabelPresenter label: (self model keyBindingForImplementors acceptVisitor: OSPlatform current shortcutPrinter).
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterHeaderPresenter >> prepareAsPackages [
 
 	order := self model order + 2.
@@ -164,19 +166,19 @@ StSpotterHeaderPresenter >> prepareAsPackages [
 	helpLabelPresenter label: (self model keyBindingForPackages acceptVisitor: OSPlatform current shortcutPrinter).
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StSpotterHeaderPresenter >> setModelBeforeInitialization: aProcessor [
 
 	model := aProcessor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterHeaderPresenter >> type: aClass [
 
 	 aClass prepareUnifiedHeaderDescriptionFor: self
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 StSpotterHeaderPresenter >> updateAmount [
 
 	amountLabelPresenter label: ('{1}/{2}' format: { 
@@ -184,7 +186,7 @@ StSpotterHeaderPresenter >> updateAmount [
 		self finalAmount ifNil: [ '...' ] })
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterHeaderPresenter >> updatePresenter [
 
 	labelPresenter label: '#', self model title.
@@ -193,19 +195,19 @@ StSpotterHeaderPresenter >> updatePresenter [
 		ifNil: [ '' ])
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StSpotterHeaderPresenter >> whenDiveInDo: aBlock [
 
 	diveInAction := aBlock
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StSpotterHeaderPresenter >> whenDiveOutDo: aBlock [
 
 	diveOutAction := aBlock
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterHeaderPresenter >> withCandidates [
 
 	^ { self }, (candidatePresentersList sort: [ :each | each model weight ] ascending)
diff --git a/src/NewTools-Spotter/StSpotterIterator.class.st b/src/NewTools-Spotter/StSpotterIterator.class.st
index 31102a814..0a6c2b7b7 100644
--- a/src/NewTools-Spotter/StSpotterIterator.class.st
+++ b/src/NewTools-Spotter/StSpotterIterator.class.st
@@ -2,53 +2,55 @@
 Define an iterator to be used to feed items to spotter
 "
 Class {
-	#name : #StSpotterIterator,
-	#superclass : #Object,
+	#name : 'StSpotterIterator',
+	#superclass : 'Object',
 	#instVars : [
 		'context',
 		'items'
 	],
-	#category : #'NewTools-Spotter-Iterators'
+	#category : 'NewTools-Spotter-Iterators',
+	#package : 'NewTools-Spotter',
+	#tag : 'Iterators'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterIterator class >> gtIterator [
 	^ self new
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> allSatisfy: aBlock [
 	self do: [ :each | (aBlock value: each) ifFalse: [ ^ false ] ].
 	^ true
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> anySatisfy: aBlock [
 	self do: [ :each | (aBlock value: each) ifTrue: [ ^ true ] ].
 	^ false
 ]
 
-{ #category : #'mimic collection' }
+{ #category : 'mimic collection' }
 StSpotterIterator >> asArray [
 	^ self items asArray
 ]
 
-{ #category : #'mimic collection' }
+{ #category : 'mimic collection' }
 StSpotterIterator >> asOrderedCollection [
 	^ self items copy " we must not expose the internal representation ! "
 ]
 
-{ #category : #'mimic collection' }
+{ #category : 'mimic collection' }
 StSpotterIterator >> asSet [
 	^ self items asSet
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> collect: aBlock [
 	^ self collect: aBlock as: self defaultItemsClass
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> collect: aBlock as: aCollectionClass [
 	| collection |
 	collection := self newAs: aCollectionClass.
@@ -57,50 +59,50 @@ StSpotterIterator >> collect: aBlock as: aCollectionClass [
 	^ collection
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterIterator >> context [
 	^ context
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterIterator >> context: aContext [
 	" we assume that if the context changes, so will the result of the iterator - so we reset the internal collection "
 	context := aContext.
 	self reset.
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterIterator >> cull: aContext [
 	self context: aContext
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterIterator >> defaultItems [
 	^ self defaultItemsClass new 
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StSpotterIterator >> defaultItemsClass [
 	^ OrderedCollection 
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> detect: aBlock [
 	^ self detect: aBlock ifNone: [ NotFound signalFor: aBlock ]
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> detect: aBlock ifFound: aBlock2 ifNone: aBlock3 [
 	self do: [ :each | aBlock value ifTrue: [ ^ aBlock2 value: each ] ].
 	^ aBlock3 value
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> detect: aBlock ifNone: aBlock2 [
 	^ self detect: aBlock ifFound: [ :each | each ] ifNone: aBlock2
 ]
 
-{ #category : #'mimic enumerating' }
+{ #category : 'mimic enumerating' }
 StSpotterIterator >> do: aBlock [
 	" the iterator must keep an internal collection of items being iterated. This guarantees that the iteration is not done multiple times in case somebody sends multiple subsequent messages like #size, #items or #first:. This will slightly decrease performance while iterating "
 	items 
@@ -113,37 +115,37 @@ StSpotterIterator >> do: aBlock [
 				aBlock value: each ] ]
 ]
 
-{ #category : #'mimic collection' }
+{ #category : 'mimic collection' }
 StSpotterIterator >> first: anInteger [
 	^ self items copyFrom: 1 to: (self size min: (anInteger max: 0))
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterIterator >> gtIterator [
 	^ self
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterIterator >> hasDynamicItems [
 	^ true
 ]
 
-{ #category : #'mimic collection' }
+{ #category : 'mimic collection' }
 StSpotterIterator >> isEmpty [
 	^ self items isEmpty
 ]
 
-{ #category : #'mimic collection' }
+{ #category : 'mimic collection' }
 StSpotterIterator >> isEmptyOrNil [
 	^ self items isEmptyOrNil
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterIterator >> itemDo: aBlock [
 	self subclassResponsibility
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterIterator >> items [
 	^ items ifNil: [ 
 		items := self defaultItems.
@@ -151,34 +153,34 @@ StSpotterIterator >> items [
 			items add: each ] ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterIterator >> items: anObject [
 	items := anObject
 ]
 
-{ #category : #'mimic collection' }
+{ #category : 'mimic collection' }
 StSpotterIterator >> last: anInteger [
 	^ self items last: (self size min: (anInteger max: 0))
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterIterator >> newAs: aCollectionClass [
 	^ items 
 		ifNil: [ aCollectionClass new ] 
 		ifNotNil: [ aCollectionClass new: self size ]
 ]
 
-{ #category : #'mimic collection' }
+{ #category : 'mimic collection' }
 StSpotterIterator >> notEmpty [
 	^ self isEmpty not
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> reject: aBlock [
 	^ self reject: aBlock as: self defaultItemsClass
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> reject: aBlock as: aCollectionClass [
 	| collection |
 	collection := self newAs: aCollectionClass.
@@ -188,7 +190,7 @@ StSpotterIterator >> reject: aBlock as: aCollectionClass [
 	^ collection
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> reject: aBlock thenCollect: aBlock2 as: aCollectionClass [
 	| collection |
 	collection := self newAs: aCollectionClass.
@@ -197,24 +199,24 @@ StSpotterIterator >> reject: aBlock thenCollect: aBlock2 as: aCollectionClass [
 	^ collection
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> reject: aBlock thenDo: aBlock2 [
 	self do: [ :each | 
 		(aBlock value: each) 
 			ifFalse: [ aBlock2 value: each ] ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterIterator >> reset [
 	items := nil.
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> select: aBlock [
 	^ self select: aBlock as: self defaultItemsClass
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> select: aBlock as: aCollectionClass [
 	| collection |
 	collection := self newAs: aCollectionClass.
@@ -224,12 +226,12 @@ StSpotterIterator >> select: aBlock as: aCollectionClass [
 	^ collection
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> select: aBlock thenCollect: aBlock2 [
 	^ self select: aBlock thenCollect: aBlock2 as: self defaultItemsClass
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> select: aBlock thenCollect: aBlock2 as: aCollectionClass [
 	| collection |
 	collection := self newAs: aCollectionClass.
@@ -238,34 +240,34 @@ StSpotterIterator >> select: aBlock thenCollect: aBlock2 as: aCollectionClass [
 	^ collection
 ]
 
-{ #category : #'mimic various enumerating' }
+{ #category : 'mimic various enumerating' }
 StSpotterIterator >> select: aBlock thenDo: aBlock2 [
 	self do: [ :each | 
 		(aBlock value: each) 
 			ifTrue: [ aBlock2 value: each ] ]
 ]
 
-{ #category : #'mimic collection' }
+{ #category : 'mimic collection' }
 StSpotterIterator >> size [
 	^ self items size
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterIterator >> stIterator [
 	^ self
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterIterator >> value [
 	^ self items
 ]
 
-{ #category : #public }
+{ #category : 'public' }
 StSpotterIterator >> value: aContext [
 	self context: aContext
 ]
 
-{ #category : #'mimic enumerating' }
+{ #category : 'mimic enumerating' }
 StSpotterIterator >> withIndexDo: aBlock [
 	| index |
 	index := 0.
diff --git a/src/NewTools-Spotter/StSpotterModel.class.st b/src/NewTools-Spotter/StSpotterModel.class.st
index a9a59af3e..125161be0 100644
--- a/src/NewTools-Spotter/StSpotterModel.class.st
+++ b/src/NewTools-Spotter/StSpotterModel.class.st
@@ -5,8 +5,8 @@ The main method is `StSpotterModel>>processSearch:on:` (is the entry point to an
 To process searches the spotter model will use a worker pool to schedule a `StSpotterQuery`, which is the actual responsible of processing it.
 "
 Class {
-	#name : #StSpotterModel,
-	#superclass : #Object,
+	#name : 'StSpotterModel',
+	#superclass : 'Object',
 	#instVars : [
 		'steps',
 		'searchUpdatedAction',
@@ -20,16 +20,18 @@ Class {
 		'queryRequestTime',
 		'processors'
 	],
-	#category : #'NewTools-Spotter-Model'
+	#category : 'NewTools-Spotter-Model',
+	#package : 'NewTools-Spotter',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSpotterModel class >> delayBeforeQuery [
 
 	^ 500 milliSeconds 
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSpotterModel class >> newOrigin: anObject [ 
 
 	^ self basicNew 
@@ -37,26 +39,26 @@ StSpotterModel class >> newOrigin: anObject [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterModel >> activeProcessors [
 
 	^ self activeStep processors
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterModel >> activeStep [
 
 	^ self steps last
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterModel >> addStep: aStep [
 
 	steps ifNil: [ steps := OrderedCollection new ].
 	steps addLast: aStep
 ]
 
-{ #category : #'private - announcing' }
+{ #category : 'private - announcing' }
 StSpotterModel >> announceAllCandidatesAdded: ann [
 
 	searchUpdatedAction ifNil: [ ^ self ].
@@ -65,7 +67,7 @@ StSpotterModel >> announceAllCandidatesAdded: ann [
 		do: [ :each | searchUpdatedAction value: each ]
 ]
 
-{ #category : #'private - announcing' }
+{ #category : 'private - announcing' }
 StSpotterModel >> announceAmountChanged: ann [
 
 	amountChangedAction ifNil: [ ^ self ].
@@ -74,35 +76,35 @@ StSpotterModel >> announceAmountChanged: ann [
 		value: ann amount
 ]
 
-{ #category : #'private - announcing' }
+{ #category : 'private - announcing' }
 StSpotterModel >> announceCandidateAdded: ann [
 
 	searchUpdatedAction ifNil: [ ^ self ].
 	searchUpdatedAction value: ann candidateLink
 ]
 
-{ #category : #'private - announcing' }
+{ #category : 'private - announcing' }
 StSpotterModel >> announceNoResults [
 
 	noResultsAction ifNil: [ ^ self ].
 	noResultsAction value
 ]
 
-{ #category : #'private - announcing' }
+{ #category : 'private - announcing' }
 StSpotterModel >> announceQueryEnded: ann [
 
 	queryEndedAction ifNil: [ ^ self ].
 	queryEndedAction value
 ]
 
-{ #category : #'private - announcing' }
+{ #category : 'private - announcing' }
 StSpotterModel >> announceQueryStarted: ann [
 
 	queryStartedAction ifNil: [ ^ self ].
 	queryStartedAction value
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterModel >> defaultProcessors [
 
 	^ (StSpotterProcessor allEnabledSubclasses 
@@ -110,7 +112,7 @@ StSpotterModel >> defaultProcessors [
 		sort: #order ascending
 ]
 
-{ #category : #'private - queries' }
+{ #category : 'private - queries' }
 StSpotterModel >> doProcessSearch: aString on: spotter [
 
 	pendingQuery := StSpotterQuery 
@@ -120,7 +122,7 @@ StSpotterModel >> doProcessSearch: aString on: spotter [
 	self pushQuery: pendingQuery
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterModel >> initialize [
 
 	super initialize.
@@ -132,7 +134,7 @@ StSpotterModel >> initialize [
 	mutex := Mutex new
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterModel >> initializeOrigin: anObject [
 	
 	self initialize.
@@ -141,25 +143,25 @@ StSpotterModel >> initializeOrigin: anObject [
 		yourself)
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterModel >> isNested [
 
 	^ self steps size > 1
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterModel >> lastSearchText [
 
 	^ self activeStep lastSearchText
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterModel >> links [
 
 	^ self activeStep links
 ]
 
-{ #category : #'private - factory' }
+{ #category : 'private - factory' }
 StSpotterModel >> newDefaultStep [
 
 	^ self newStep
@@ -167,13 +169,13 @@ StSpotterModel >> newDefaultStep [
 		yourself
 ]
 
-{ #category : #'private - factory' }
+{ #category : 'private - factory' }
 StSpotterModel >> newStep [
 
 	^ StSpotterStep on: self
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterModel >> popStep [
 	| lastQuery |
 
@@ -186,7 +188,7 @@ StSpotterModel >> popStep [
 	self activeStep activate
 ]
 
-{ #category : #'private - queries' }
+{ #category : 'private - queries' }
 StSpotterModel >> processSearch: aString on: spotter [
 
 	queryRequestTime := Time now.
@@ -196,19 +198,19 @@ StSpotterModel >> processSearch: aString on: spotter [
 			ifTrue: [ self doProcessSearch: aString on: spotter ] ] fork.	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterModel >> processors [
 
 	^ processors ifNil: [ self defaultProcessors ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterModel >> processors: aCollection [
 
 	processors := aCollection
 ]
 
-{ #category : #'accessing - query' }
+{ #category : 'accessing - query' }
 StSpotterModel >> pushQuery: aQuery [
 
 	self schedule: [ 
@@ -216,7 +218,7 @@ StSpotterModel >> pushQuery: aQuery [
 			self activeStep pushQuery: aQuery ] ]
 ]
 
-{ #category : #'private - queries' }
+{ #category : 'private - queries' }
 StSpotterModel >> pushStepForProcessor: aProcessor [
 	| step allCandidates processorLink |
 
@@ -230,13 +232,13 @@ StSpotterModel >> pushStepForProcessor: aProcessor [
 	self addStep: step
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterModel >> results [
 
 	^ self activeStep results
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterModel >> schedule: aBlock [
 
 	scheduler purge.
@@ -246,27 +248,27 @@ StSpotterModel >> schedule: aBlock [
 			fork: [ :e | e pass ] ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterModel >> scheduler [
 
 	^ scheduler
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterModel >> stSpotterProcessorsFor: aStep [
 
 	self processors 
 		do: [ :each | aStep addProcessor: each ]
 ]
 
-{ #category : #'accessing - query' }
+{ #category : 'accessing - query' }
 StSpotterModel >> startProcessingOn: spotter [
 
 	self doProcessSearch: '' on: spotter. 
 
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterModel >> steps [
 
 	^ steps ifNil: [ 
@@ -274,7 +276,7 @@ StSpotterModel >> steps [
 		steps ]
 ]
 
-{ #category : #'accessing - query' }
+{ #category : 'accessing - query' }
 StSpotterModel >> stopProcessing [
 
 	self activeStep deactivate.
@@ -282,31 +284,31 @@ StSpotterModel >> stopProcessing [
 	
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StSpotterModel >> whenAmountChangedDo: aBlock [
 
 	amountChangedAction := aBlock
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StSpotterModel >> whenNoResultsDo: aBlock [
 
 	noResultsAction := aBlock
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StSpotterModel >> whenQueryEndedDo: aBlock [
 
 	queryEndedAction := aBlock
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StSpotterModel >> whenQueryStartedDo: aBlock [
 
 	queryStartedAction := aBlock
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StSpotterModel >> whenSearchUpdatedDo: aBlock [
 
 	searchUpdatedAction := aBlock
diff --git a/src/NewTools-Spotter/StSpotterPragmaBasedProcessor.extension.st b/src/NewTools-Spotter/StSpotterPragmaBasedProcessor.extension.st
index 40e81f559..5a3c5b3f9 100644
--- a/src/NewTools-Spotter/StSpotterPragmaBasedProcessor.extension.st
+++ b/src/NewTools-Spotter/StSpotterPragmaBasedProcessor.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #StSpotterPragmaBasedProcessor }
+Extension { #name : 'StSpotterPragmaBasedProcessor' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StSpotterPragmaBasedProcessor >> headerCategoryFor: aLink on: aSpotterPresenter [
 
 	^ aSpotterPresenter headerCategoryFor: aLink
diff --git a/src/NewTools-Spotter/StSpotterProcessor.extension.st b/src/NewTools-Spotter/StSpotterProcessor.extension.st
index c1a96e894..927aa8b31 100644
--- a/src/NewTools-Spotter/StSpotterProcessor.extension.st
+++ b/src/NewTools-Spotter/StSpotterProcessor.extension.st
@@ -1,24 +1,24 @@
-Extension { #name : #StSpotterProcessor }
+Extension { #name : 'StSpotterProcessor' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StSpotterProcessor >> headerCategoryFor: aLink on: aSpotterPresenter [
 
 	^ aSpotterPresenter headerCategoryFor: aLink
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StSpotterProcessor >> labelForClasses [
 
 	^ '#Classes'
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StSpotterProcessor >> labelForImplementors [
 
 	^ '#Implementors'
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StSpotterProcessor >> labelForPackages [
 
 	^ '#Packages'
diff --git a/src/NewTools-Spotter/StSpotterProcessorEnded.class.st b/src/NewTools-Spotter/StSpotterProcessorEnded.class.st
index fe2771b65..25aaffd4d 100644
--- a/src/NewTools-Spotter/StSpotterProcessorEnded.class.st
+++ b/src/NewTools-Spotter/StSpotterProcessorEnded.class.st
@@ -2,15 +2,17 @@
 Announce a processor execution ended.
 "
 Class {
-	#name : #StSpotterProcessorEnded,
-	#superclass : #Announcement,
+	#name : 'StSpotterProcessorEnded',
+	#superclass : 'Announcement',
 	#instVars : [
 		'processor'
 	],
-	#category : #'NewTools-Spotter-Announcements'
+	#category : 'NewTools-Spotter-Announcements',
+	#package : 'NewTools-Spotter',
+	#tag : 'Announcements'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSpotterProcessorEnded class >> newProcessor: aProcessor [
 
 	^ self new 
@@ -18,13 +20,13 @@ StSpotterProcessorEnded class >> newProcessor: aProcessor [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessorEnded >> processor [
 
 	^ processor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessorEnded >> processor: anObject [
 
 	processor := anObject
diff --git a/src/NewTools-Spotter/StSpotterProcessorLink.class.st b/src/NewTools-Spotter/StSpotterProcessorLink.class.st
index 93f2d8be4..0e5ff2da6 100644
--- a/src/NewTools-Spotter/StSpotterProcessorLink.class.st
+++ b/src/NewTools-Spotter/StSpotterProcessorLink.class.st
@@ -3,29 +3,31 @@ a link with a `StSpotterProcessorLink>>#processor`.
 it is intended to work as element of a linked list.
 "
 Class {
-	#name : #StSpotterProcessorLink,
-	#superclass : #DoubleLink,
+	#name : 'StSpotterProcessorLink',
+	#superclass : 'DoubleLink',
 	#instVars : [
 		'headLink',
 		'tailLink',
 		'size'
 	],
-	#category : #'NewTools-Spotter-Model'
+	#category : 'NewTools-Spotter-Model',
+	#package : 'NewTools-Spotter',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessorLink class >> from: aDoubleLink [
 
 	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessorLink >> asStSpotterProcessorLink [
 
 	^ self
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSpotterProcessorLink >> clear [
 
 	self
@@ -35,59 +37,59 @@ StSpotterProcessorLink >> clear [
 	size := 0.
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StSpotterProcessorLink >> displayStringOn: stream [
 	stream 
 		nextPutAll: 'Processor link: ';
 		nextPutAll: self processor title asString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessorLink >> headLink [
 	^ headLink
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessorLink >> headLink: anObject [
 	headLink := anObject
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StSpotterProcessorLink >> incrementSize [
 
 	size := self size + 1
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterProcessorLink >> isEmpty [
 
 	^ self headLink isNil
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterProcessorLink >> isFull [
 
 	^ self size = self processor itemsLimit
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessorLink >> processor [
 
 	^ self value
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessorLink >> size [
 
 	^ size ifNil: [ size := 0 ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessorLink >> tailLink [
 	^ tailLink
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessorLink >> tailLink: anObject [
 	tailLink := anObject
 ]
diff --git a/src/NewTools-Spotter/StSpotterProcessorStarted.class.st b/src/NewTools-Spotter/StSpotterProcessorStarted.class.st
index 649e38523..2a2302bdc 100644
--- a/src/NewTools-Spotter/StSpotterProcessorStarted.class.st
+++ b/src/NewTools-Spotter/StSpotterProcessorStarted.class.st
@@ -2,15 +2,17 @@
 Announce a processor execution started.
 "
 Class {
-	#name : #StSpotterProcessorStarted,
-	#superclass : #Announcement,
+	#name : 'StSpotterProcessorStarted',
+	#superclass : 'Announcement',
 	#instVars : [
 		'processor'
 	],
-	#category : #'NewTools-Spotter-Announcements'
+	#category : 'NewTools-Spotter-Announcements',
+	#package : 'NewTools-Spotter',
+	#tag : 'Announcements'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSpotterProcessorStarted class >> newProcessor: aProcessor [
 
 	^ self new 
@@ -18,13 +20,13 @@ StSpotterProcessorStarted class >> newProcessor: aProcessor [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessorStarted >> processor [
 
 	^ processor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterProcessorStarted >> processor: anObject [
 
 	processor := anObject
diff --git a/src/NewTools-Spotter/StSpotterQuery.class.st b/src/NewTools-Spotter/StSpotterQuery.class.st
index 6c6fb58aa..bf5499b2f 100644
--- a/src/NewTools-Spotter/StSpotterQuery.class.st
+++ b/src/NewTools-Spotter/StSpotterQuery.class.st
@@ -4,8 +4,8 @@ A query iterates all defined `relevantProcessors` to retrieve the `results`.
 To produce a result, it takes the `searchText` and `process` it.
 "
 Class {
-	#name : #StSpotterQuery,
-	#superclass : #Object,
+	#name : 'StSpotterQuery',
+	#superclass : 'Object',
 	#instVars : [
 		'candidatesList',
 		'processors',
@@ -14,16 +14,18 @@ Class {
 		'finished',
 		'spotterPresenter'
 	],
-	#category : #'NewTools-Spotter-Model'
+	#category : 'NewTools-Spotter-Model',
+	#package : 'NewTools-Spotter',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSpotterQuery class >> new [
 
 	self error: 'Use #newSearch:on:'
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSpotterQuery class >> newSearch: aString on: spotter [
 
 	^ super new 
@@ -32,20 +34,20 @@ StSpotterQuery class >> newSearch: aString on: spotter [
 		yourself
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterQuery >> allCandidatesAdded: ann [
 	
 	ann candidateLinks ifEmpty: [ ^ self ].
 	candidateLinks addAll: ann candidateLinks
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterQuery >> announcer [
 
 	^ self candidatesList announcer
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterQuery >> candidateAdded: ann [
 
 	candidateLinks add: ann candidateLink.
@@ -53,13 +55,13 @@ StSpotterQuery >> candidateAdded: ann [
 	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterQuery >> candidatesList [
 
 	^ candidatesList
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterQuery >> filteringText [
 		
 	^ self searchText substrings 
@@ -68,7 +70,7 @@ StSpotterQuery >> filteringText [
 		ifNone: [ nil ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterQuery >> initialize [
 
 	super initialize.
@@ -77,7 +79,7 @@ StSpotterQuery >> initialize [
 	candidateLinks := Set new
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSpotterQuery >> initializeCandidatesList [
 
 	candidatesList := StSpotterCandidatesList new.
@@ -89,19 +91,19 @@ StSpotterQuery >> initializeCandidatesList [
 		when: StSpotterQueryEnded send: #queryEnded: to: self.
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSpotterQuery >> isFinished [
 
 	^ finished
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterQuery >> links [
 
 	^ candidateLinks
 ]
 
-{ #category : #'private - factory' }
+{ #category : 'private - factory' }
 StSpotterQuery >> newContextFor: aStream text: aString [
 
 	^ StSpotterContext new 
@@ -112,7 +114,7 @@ StSpotterQuery >> newContextFor: aStream text: aString [
 		yourself
 ]
 
-{ #category : #'private - factory' }
+{ #category : 'private - factory' }
 StSpotterQuery >> newStreamFor: candidates [
 
 	^ StSpotterStream new
@@ -122,19 +124,19 @@ StSpotterQuery >> newStreamFor: candidates [
 		yourself
 ]
 
-{ #category : #processing }
+{ #category : 'processing' }
 StSpotterQuery >> notifyEnded: aContext [
 
 	self announcer announce: StSpotterQueryEnded new
 ]
 
-{ #category : #processing }
+{ #category : 'processing' }
 StSpotterQuery >> notifyStarted: aContext [
 	
 	self announcer announce: StSpotterQueryStarted new
 ]
 
-{ #category : #processing }
+{ #category : 'processing' }
 StSpotterQuery >> process [
 	| stream context |
 
@@ -153,25 +155,25 @@ StSpotterQuery >> process [
 		ifTrue: [ spotterPresenter removeAllResults ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterQuery >> processors [
 
 	^ processors
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterQuery >> processors: aCollection [
 
 	processors := aCollection
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 StSpotterQuery >> queryEnded: aStSpotterQueryEnded [ 
 
 	spotterPresenter flushPendingUpdates
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterQuery >> relevantProcessors [
 
 	^ self filteringText
@@ -179,37 +181,37 @@ StSpotterQuery >> relevantProcessors [
 		ifNil: [ self processors ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterQuery >> relevantProcessorsFor: aString [
 		
 	^ (self processors select: [ :each | each isRelevantForQuery: aString ])
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterQuery >> results [
 
 	^ self links collect: [ :each | each value ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterQuery >> searchText [
 
 	^ searchText
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterQuery >> searchText: aString [
 
 	searchText := aString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterQuery >> spotter: aSpotterPresenter [
 
  spotterPresenter := aSpotterPresenter
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterQuery >> terminate [
 
 	self processors do: [ :each | each stop ]
diff --git a/src/NewTools-Spotter/StSpotterQueryEnded.class.st b/src/NewTools-Spotter/StSpotterQueryEnded.class.st
index 5632ff981..721c9cb14 100644
--- a/src/NewTools-Spotter/StSpotterQueryEnded.class.st
+++ b/src/NewTools-Spotter/StSpotterQueryEnded.class.st
@@ -2,7 +2,9 @@
 Announce a query ended its execution.
 "
 Class {
-	#name : #StSpotterQueryEnded,
-	#superclass : #Announcement,
-	#category : #'NewTools-Spotter-Announcements'
+	#name : 'StSpotterQueryEnded',
+	#superclass : 'Announcement',
+	#category : 'NewTools-Spotter-Announcements',
+	#package : 'NewTools-Spotter',
+	#tag : 'Announcements'
 }
diff --git a/src/NewTools-Spotter/StSpotterQueryStarted.class.st b/src/NewTools-Spotter/StSpotterQueryStarted.class.st
index 5f2f53bbe..bb7aa7cab 100644
--- a/src/NewTools-Spotter/StSpotterQueryStarted.class.st
+++ b/src/NewTools-Spotter/StSpotterQueryStarted.class.st
@@ -2,7 +2,9 @@
 Announce a query started.
 "
 Class {
-	#name : #StSpotterQueryStarted,
-	#superclass : #Announcement,
-	#category : #'NewTools-Spotter-Announcements'
+	#name : 'StSpotterQueryStarted',
+	#superclass : 'Announcement',
+	#category : 'NewTools-Spotter-Announcements',
+	#package : 'NewTools-Spotter',
+	#tag : 'Announcements'
 }
diff --git a/src/NewTools-Spotter/StSpotterStep.class.st b/src/NewTools-Spotter/StSpotterStep.class.st
index af268c881..a0bb2f60f 100644
--- a/src/NewTools-Spotter/StSpotterStep.class.st
+++ b/src/NewTools-Spotter/StSpotterStep.class.st
@@ -7,18 +7,20 @@ So, in the processing search scheme of things:
 a model (`StSpotterModel`) has a step (`StSpotterStep`) which receives a query (`StSpotterQuery`) which is the one performing the actual search.
 "
 Class {
-	#name : #StSpotterStep,
-	#superclass : #Object,
+	#name : 'StSpotterStep',
+	#superclass : 'Object',
 	#instVars : [
 		'model',
 		'origin',
 		'activeQuery',
 		'processors'
 	],
-	#category : #'NewTools-Spotter-Model'
+	#category : 'NewTools-Spotter-Model',
+	#package : 'NewTools-Spotter',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSpotterStep class >> on: aSpotterModel [
 
 	^ self new 
@@ -26,14 +28,14 @@ StSpotterStep class >> on: aSpotterModel [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> activate [
 
 	activeQuery ifNil: [ ^ self ].
 	self activateQuery: activeQuery
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterStep >> activateQuery: aQuery [
 
 	activeQuery ifNotNil: [ self disconnectQuery: aQuery ].
@@ -42,19 +44,19 @@ StSpotterStep >> activateQuery: aQuery [
 	self refreshQueryStatus: aQuery
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> activeQuery [
 
 	^ activeQuery
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> addProcessor: processor [
 	
 	processors add: processor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> candidatesList [
 
 	^ activeQuery 
@@ -62,7 +64,7 @@ StSpotterStep >> candidatesList [
 		ifNil: [ #() ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterStep >> connectQuery: aQuery [
 
 	aQuery announcer
@@ -73,7 +75,7 @@ StSpotterStep >> connectQuery: aQuery [
 		when: StSpotterQueryEnded send: #announceQueryEnded: to: self model.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> deactivate [
 
 	self activeQuery ifNil: [ ^ self ].
@@ -83,19 +85,19 @@ StSpotterStep >> deactivate [
 
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterStep >> disconnectQuery: aQuery [
 
 	aQuery announcer unsubscribe: self model
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> lastSearchText [
 
 	^ self activeQuery searchText
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> links [
 
 	^ activeQuery 
@@ -103,7 +105,7 @@ StSpotterStep >> links [
 		ifNil: [ #() ]
 ]
 
-{ #category : #factory }
+{ #category : 'factory' }
 StSpotterStep >> listProcessor [
 	| processor |
 	
@@ -113,31 +115,31 @@ StSpotterStep >> listProcessor [
 	^ processor
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> model [
 
 	^ model
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> model: aSpotterModel [
 
 	model := aSpotterModel
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> origin [
 
 	^ origin
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> origin: anObject [
 
 	origin := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> previousProcessorFrom: aCollection [
 
 	aCollection do: [ :each | 
@@ -150,7 +152,7 @@ StSpotterStep >> previousProcessorFrom: aCollection [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> processors [
 
 	^ processors ifNil: [ 
@@ -159,13 +161,13 @@ StSpotterStep >> processors [
 		processors ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> processors: aCollection [
 
 	processors := aCollection
 ]
 
-{ #category : #'accessing - query' }
+{ #category : 'accessing - query' }
 StSpotterStep >> pushQuery: aQuery [
 
 	self deactivate.
@@ -175,7 +177,7 @@ StSpotterStep >> pushQuery: aQuery [
 	aQuery process
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSpotterStep >> refreshQueryStatus: aQuery [
 
 	aQuery links ifEmpty: [ ^ self ].
@@ -190,7 +192,7 @@ StSpotterStep >> refreshQueryStatus: aQuery [
 			yourself) ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStep >> results [
 
 	^ activeQuery 
diff --git a/src/NewTools-Spotter/StSpotterStream.class.st b/src/NewTools-Spotter/StSpotterStream.class.st
index 48d3b4942..452b80f1f 100644
--- a/src/NewTools-Spotter/StSpotterStream.class.st
+++ b/src/NewTools-Spotter/StSpotterStream.class.st
@@ -2,18 +2,20 @@
 A place to store the results of a `StSpotterQuery` and to send notifications about it.
 "
 Class {
-	#name : #StSpotterStream,
-	#superclass : #Object,
+	#name : 'StSpotterStream',
+	#superclass : 'Object',
 	#instVars : [
 		'onAddedSelector',
 		'onRemoveSelector',
 		'receiver',
 		'timestamp'
 	],
-	#category : #'NewTools-Spotter-Model'
+	#category : 'NewTools-Spotter-Model',
+	#package : 'NewTools-Spotter',
+	#tag : 'Model'
 }
 
-{ #category : #'adding/removing' }
+{ #category : 'adding/removing' }
 StSpotterStream >> addObject: firstObject inProcessor: secondObject [
 
 	self 
@@ -22,7 +24,7 @@ StSpotterStream >> addObject: firstObject inProcessor: secondObject [
 	Processor yield
 ]
 
-{ #category : #'adding/removing' }
+{ #category : 'adding/removing' }
 StSpotterStream >> addObjects: aCollection inProcessor: aProcessor [
 
 	self 
@@ -31,31 +33,31 @@ StSpotterStream >> addObjects: aCollection inProcessor: aProcessor [
 	Processor yield
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStream >> onAddedSelector [
 
 	^ onAddedSelector
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStream >> onAddedSelector: anObject [
 
 	onAddedSelector := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStream >> onRemoveSelector [
 
 	^ onRemoveSelector
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStream >> onRemoveSelector: anObject [
 
 	onRemoveSelector := anObject
 ]
 
-{ #category : #performing }
+{ #category : 'performing' }
 StSpotterStream >> performSymbol: aSymbol withArguments: aCollection [
 	| time |
 
@@ -68,17 +70,17 @@ StSpotterStream >> performSymbol: aSymbol withArguments: aCollection [
 		self receiver perform: aSymbol withEnoughArguments: aCollection ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStream >> receiver [
 	^ receiver
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStream >> receiver: anObject [
 	receiver := anObject
 ]
 
-{ #category : #'adding/removing' }
+{ #category : 'adding/removing' }
 StSpotterStream >> removeAllCandidates [
 
 	self 
@@ -87,17 +89,17 @@ StSpotterStream >> removeAllCandidates [
 	Processor yield
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStream >> timestamp [
 	^ timestamp
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSpotterStream >> timestamp: anObject [
 	timestamp := anObject
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StSpotterStream >> updateTimestamp [
 
 	self timestamp: Time microsecondClockValue
diff --git a/src/NewTools-Spotter/StStringFilter.class.st b/src/NewTools-Spotter/StStringFilter.class.st
index 511fd547c..c39ba9abf 100644
--- a/src/NewTools-Spotter/StStringFilter.class.st
+++ b/src/NewTools-Spotter/StStringFilter.class.st
@@ -2,16 +2,18 @@
 A string based filter.
 "
 Class {
-	#name : #StStringFilter,
-	#superclass : #StBaseFilter,
+	#name : 'StStringFilter',
+	#superclass : 'StBaseFilter',
 	#instVars : [
 		'caseSensitive',
 		'query'
 	],
-	#category : #'NewTools-Spotter-Filters'
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 StStringFilter >> applyFilter [
 	self hasQuery ifFalse: [ 
 		self applyFilterWithoutQuery.
@@ -20,14 +22,14 @@ StStringFilter >> applyFilter [
 	^ self filteredItems " return the filtered items only "
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StStringFilter >> applyFilterWithQuery [
 
 	[ self doApplyFilterWithQuery ]
 		on: StLimitArrived do: [ ^ self ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StStringFilter >> applyFilterWithoutQuery [
 	" WARNING: this is not a copy of GTNullFilter>>#applyFilterWithoutQuery !!! "
 
@@ -46,33 +48,33 @@ StStringFilter >> applyFilterWithoutQuery [
 			self addItems: self filteredItems ]] on: StLimitArrived do: [ ^ self ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StStringFilter >> caseSensitive [
 	^ caseSensitive
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StStringFilter >> caseSensitive: anObject [
 	caseSensitive := anObject
 ]
 
-{ #category : #'accessing - defaults' }
+{ #category : 'accessing - defaults' }
 StStringFilter >> defaultCaseSensitive [
 	^ false
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StStringFilter >> doApplyFilterWithQuery [
 
 	self subclassResponsibility 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StStringFilter >> hasQuery [
 	^ self query isEmptyOrNil not
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StStringFilter >> prepareFilterInContext: aSpotterContext [
 	super prepareFilterInContext: aSpotterContext.
 	
@@ -82,12 +84,12 @@ StStringFilter >> prepareFilterInContext: aSpotterContext [
 		ifFalse: [ self context textLowercase ])
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StStringFilter >> query [
 	^ query
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StStringFilter >> query: anObject [
 	query := anObject
 ]
diff --git a/src/NewTools-Spotter/StUnifiedProcessor.extension.st b/src/NewTools-Spotter/StUnifiedProcessor.extension.st
index 9633f57db..98380387b 100644
--- a/src/NewTools-Spotter/StUnifiedProcessor.extension.st
+++ b/src/NewTools-Spotter/StUnifiedProcessor.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #StUnifiedProcessor }
+Extension { #name : 'StUnifiedProcessor' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StUnifiedProcessor >> headerCategoryFor: aLink on: aSpotterPresenter [
 
 	^ aLink value 
@@ -8,19 +8,19 @@ StUnifiedProcessor >> headerCategoryFor: aLink on: aSpotterPresenter [
 		on: aSpotterPresenter
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StUnifiedProcessor >> keyBindingForClasses [
 
 	^ $b meta
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StUnifiedProcessor >> keyBindingForImplementors [
 
 	^ $m meta
 ]
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 StUnifiedProcessor >> keyBindingForPackages [
 
 	^ $p meta
diff --git a/src/NewTools-Spotter/StUnorderedFilter.class.st b/src/NewTools-Spotter/StUnorderedFilter.class.st
index 68804f1e0..01715b9b2 100644
--- a/src/NewTools-Spotter/StUnorderedFilter.class.st
+++ b/src/NewTools-Spotter/StUnorderedFilter.class.st
@@ -2,12 +2,14 @@
 a base filter for ""unordered"" elements (not a collection)
 "
 Class {
-	#name : #StUnorderedFilter,
-	#superclass : #StStringFilter,
-	#category : #'NewTools-Spotter-Filters'
+	#name : 'StUnorderedFilter',
+	#superclass : 'StStringFilter',
+	#category : 'NewTools-Spotter-Filters',
+	#package : 'NewTools-Spotter',
+	#tag : 'Filters'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 StUnorderedFilter >> doApplyFilterWithQuery [
 
 	| unorderedMatchedItems |
@@ -22,7 +24,7 @@ StUnorderedFilter >> doApplyFilterWithQuery [
 	self filteredItems: unorderedMatchedItems
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StUnorderedFilter >> isMatchedItem: anItem [
 	^ false
 ]
diff --git a/src/NewTools-Spotter/String.extension.st b/src/NewTools-Spotter/String.extension.st
index 278e6053a..e5cab337e 100644
--- a/src/NewTools-Spotter/String.extension.st
+++ b/src/NewTools-Spotter/String.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #String }
+Extension { #name : 'String' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 String >> spotterPreview: aBuilder [
 
 	^ aBuilder newText
diff --git a/src/NewTools-Spotter/ToolShortcutsCategory.extension.st b/src/NewTools-Spotter/ToolShortcutsCategory.extension.st
index 6b70719d0..560340cbe 100644
--- a/src/NewTools-Spotter/ToolShortcutsCategory.extension.st
+++ b/src/NewTools-Spotter/ToolShortcutsCategory.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #ToolShortcutsCategory }
+Extension { #name : 'ToolShortcutsCategory' }
 
-{ #category : #'*NewTools-Spotter' }
+{ #category : '*NewTools-Spotter' }
 ToolShortcutsCategory >> openSpotter [
 
 	<shortcut>
diff --git a/src/NewTools-Spotter/package.st b/src/NewTools-Spotter/package.st
index 12f1738d6..36cf72943 100644
--- a/src/NewTools-Spotter/package.st
+++ b/src/NewTools-Spotter/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Spotter' }
+Package { #name : 'NewTools-Spotter' }
diff --git a/src/NewTools-SystemBrowser/StSBBasePackageModel.class.st b/src/NewTools-SystemBrowser/StSBBasePackageModel.class.st
index 66e39e937..2c9b998f5 100644
--- a/src/NewTools-SystemBrowser/StSBBasePackageModel.class.st
+++ b/src/NewTools-SystemBrowser/StSBBasePackageModel.class.st
@@ -1,16 +1,18 @@
 Class {
-	#name : #StSBBasePackageModel,
-	#superclass : #StSBModel,
-	#category : #'NewTools-SystemBrowser-Model'
+	#name : 'StSBBasePackageModel',
+	#superclass : 'StSBModel',
+	#category : 'NewTools-SystemBrowser-Model',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBBasePackageModel >> children [
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBBasePackageModel >> classTemplate [
 
 	self flag: #TODO. "Maybe extract this into its own creation tool, as Calypso 1?"
@@ -20,31 +22,31 @@ StSBBasePackageModel >> classTemplate [
 	package: ''', self fullName, ''''
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBBasePackageModel >> classes [
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBBasePackageModel >> comment [
 
 	^ self package packageComment
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBBasePackageModel >> fullName [
 
 	^ self name
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBBasePackageModel >> package [
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBBasePackageModel >> windowTitle [
 	
 	^ 'Package: ', self name
diff --git a/src/NewTools-SystemBrowser/StSBClassModel.class.st b/src/NewTools-SystemBrowser/StSBClassModel.class.st
index 1c9966034..1421bb8df 100644
--- a/src/NewTools-SystemBrowser/StSBClassModel.class.st
+++ b/src/NewTools-SystemBrowser/StSBClassModel.class.st
@@ -1,13 +1,15 @@
 Class {
-	#name : #StSBClassModel,
-	#superclass : #StSBModel,
+	#name : 'StSBClassModel',
+	#superclass : 'StSBModel',
 	#instVars : [
 		'modelClass'
 	],
-	#category : #'NewTools-SystemBrowser-Model'
+	#category : 'NewTools-SystemBrowser-Model',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSBClassModel class >> newEnvironment: anEnvironment  class: aClass [
 
 	^ self new 
@@ -16,13 +18,13 @@ StSBClassModel class >> newEnvironment: anEnvironment  class: aClass [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassModel >> behavior [
 
 	^ nil
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassModel >> classProtocols [
 
 	^ self classQuery execute items collect: [ :each |
@@ -31,7 +33,7 @@ StSBClassModel >> classProtocols [
 			protocol: each  ]
 ]
 
-{ #category : #'private queries' }
+{ #category : 'private queries' }
 StSBClassModel >> classQuery [
 
 	^ ClyAllMethodGroupsQuery 
@@ -40,32 +42,32 @@ StSBClassModel >> classQuery [
 		in: self environment
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassModel >> comment [
 
 	^ self modelClass comment
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassModel >> definition [
 
 	^ self modelClass definitionWithSlots
 	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassModel >> icon [
 
 	^ self modelClass systemIcon
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassModel >> installInteractionModelTo: aCodePresenter [
 
 	aCodePresenter beForBehavior: self behavior
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassModel >> instanceProtocols [
 
 	^ self instanceQuery execute items collect: [ :each |
@@ -74,7 +76,7 @@ StSBClassModel >> instanceProtocols [
 			protocol: each  ]
 ]
 
-{ #category : #'private queries' }
+{ #category : 'private queries' }
 StSBClassModel >> instanceQuery [
 
 	^ ClyAllMethodGroupsQuery 
@@ -83,23 +85,23 @@ StSBClassModel >> instanceQuery [
 		in: self environment
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassModel >> modelClass [
 	^ modelClass
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassModel >> modelClass: anObject [
 	modelClass := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassModel >> name [
 
 	^ self modelClass name
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassModel >> windowTitle [ 
 
 	^ 'Class: ', self name
diff --git a/src/NewTools-SystemBrowser/StSBClassesPanel.class.st b/src/NewTools-SystemBrowser/StSBClassesPanel.class.st
index 2a55a642a..ca41e89d9 100644
--- a/src/NewTools-SystemBrowser/StSBClassesPanel.class.st
+++ b/src/NewTools-SystemBrowser/StSBClassesPanel.class.st
@@ -1,13 +1,15 @@
 Class {
-	#name : #StSBClassesPanel,
-	#superclass : #StSBPanel,
+	#name : 'StSBClassesPanel',
+	#superclass : 'StSBPanel',
 	#instVars : [
 		'classList'
 	],
-	#category : #'NewTools-SystemBrowser-View'
+	#category : 'NewTools-SystemBrowser-View',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'View'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSBClassesPanel class >> defaultSpec [
 
 	^ SpBoxLayout newVertical 
@@ -15,24 +17,24 @@ StSBClassesPanel class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassesPanel >> classList [
 	^ classList
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBClassesPanel >> defaultInputPort [
 
 	^ self inputItemsPort
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBClassesPanel >> defaultOutputPort [
 
 	^ self outputSelectionPort
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBClassesPanel >> gotoClass: aClass [
 	| items classModel |
 
@@ -44,7 +46,7 @@ StSBClassesPanel >> gotoClass: aClass [
 	self classList selectItem: classModel
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBClassesPanel >> initializePresenters [
 	
 	classList := self newTable
@@ -55,7 +57,7 @@ StSBClassesPanel >> initializePresenters [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBClassesPanel >> inputItemsPort [
 
 	^ (SpListItemsPort newPresenter: self)
@@ -63,7 +65,7 @@ StSBClassesPanel >> inputItemsPort [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBClassesPanel >> outputSelectionPort [
 	
 	^ (SpSelectionPort newPresenter: self)
diff --git a/src/NewTools-SystemBrowser/StSBEnvironmentModel.class.st b/src/NewTools-SystemBrowser/StSBEnvironmentModel.class.st
index f510ec3e8..e12cd938d 100644
--- a/src/NewTools-SystemBrowser/StSBEnvironmentModel.class.st
+++ b/src/NewTools-SystemBrowser/StSBEnvironmentModel.class.st
@@ -1,13 +1,15 @@
 Class {
-	#name : #StSBEnvironmentModel,
-	#superclass : #StSBModel,
+	#name : 'StSBEnvironmentModel',
+	#superclass : 'StSBModel',
 	#instVars : [
 		'allPackagesQuery'
 	],
-	#category : #'NewTools-SystemBrowser-Model'
+	#category : 'NewTools-SystemBrowser-Model',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSBEnvironmentModel class >> newEnvironment: aNavigationEnvironment [
 
 	^ self new 
@@ -15,7 +17,7 @@ StSBEnvironmentModel class >> newEnvironment: aNavigationEnvironment [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBEnvironmentModel >> allPackages [ 
 
 	^ ((self allPackagesQuery execute) items 
@@ -23,25 +25,25 @@ StSBEnvironmentModel >> allPackages [
 		sorted: #name ascending
 ]
 
-{ #category : #'private queries' }
+{ #category : 'private queries' }
 StSBEnvironmentModel >> allPackagesQuery [
 
 	^ allPackagesQuery ifNil: [ allPackagesQuery := self newAllPackagesQuery ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBEnvironmentModel >> name [
 
 	^ nil
 ]
 
-{ #category : #'private queries factory' }
+{ #category : 'private queries factory' }
 StSBEnvironmentModel >> newAllPackagesQuery [
 
 	^ ClyAllPackagesQuery sortedFrom: self systemScope
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBEnvironmentModel >> systemScope [
 
 	^ self environment systemScope
diff --git a/src/NewTools-SystemBrowser/StSBMethodModel.class.st b/src/NewTools-SystemBrowser/StSBMethodModel.class.st
index 8cad08b15..f10dc65bc 100644
--- a/src/NewTools-SystemBrowser/StSBMethodModel.class.st
+++ b/src/NewTools-SystemBrowser/StSBMethodModel.class.st
@@ -1,13 +1,15 @@
 Class {
-	#name : #StSBMethodModel,
-	#superclass : #StSBModel,
+	#name : 'StSBMethodModel',
+	#superclass : 'StSBModel',
 	#instVars : [
 		'method'
 	],
-	#category : #'NewTools-SystemBrowser-Model'
+	#category : 'NewTools-SystemBrowser-Model',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSBMethodModel class >> newEnvironment: anEnvironment method: aMethod [
 
 	^ self new 
@@ -16,41 +18,41 @@ StSBMethodModel class >> newEnvironment: anEnvironment method: aMethod [
 		yourself
 ]
 
-{ #category : #'api-shout' }
+{ #category : 'api-shout' }
 StSBMethodModel >> behavior [
 
 	^ self method methodClass
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBMethodModel >> definition [
 	
 	^ self method sourceCode
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBMethodModel >> installInteractionModelTo: aCodePresenter [
 
 	aCodePresenter beForMethod: self method
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBMethodModel >> method [
 	^ method
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBMethodModel >> method: anObject [
 	method := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBMethodModel >> name [
 
 	^ self method selector
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBMethodModel >> windowTitle [
 
 	^ self method printString
diff --git a/src/NewTools-SystemBrowser/StSBModel.class.st b/src/NewTools-SystemBrowser/StSBModel.class.st
index cd8ae1851..78cccf721 100644
--- a/src/NewTools-SystemBrowser/StSBModel.class.st
+++ b/src/NewTools-SystemBrowser/StSBModel.class.st
@@ -1,43 +1,45 @@
 Class {
-	#name : #StSBModel,
-	#superclass : #Object,
+	#name : 'StSBModel',
+	#superclass : 'Object',
 	#instVars : [
 		'environment'
 	],
-	#category : #'NewTools-SystemBrowser-Model'
+	#category : 'NewTools-SystemBrowser-Model',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBModel >> application [ 
 
 	^ StPharoApplication current
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBModel >> environment [
 
 	^ environment
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBModel >> environment: anEnvironment [
 
 	environment := anEnvironment
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBModel >> icon [
 
 	^ nil
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBModel >> name [
 
 	^ self subclassResponsibility
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBModel >> windowTitle [
 	
 	^ 'TODO'
diff --git a/src/NewTools-SystemBrowser/StSBPackageModel.class.st b/src/NewTools-SystemBrowser/StSBPackageModel.class.st
index 475c2ad69..4b19ec966 100644
--- a/src/NewTools-SystemBrowser/StSBPackageModel.class.st
+++ b/src/NewTools-SystemBrowser/StSBPackageModel.class.st
@@ -1,13 +1,15 @@
 Class {
-	#name : #StSBPackageModel,
-	#superclass : #StSBBasePackageModel,
+	#name : 'StSBPackageModel',
+	#superclass : 'StSBBasePackageModel',
 	#instVars : [
 		'package'
 	],
-	#category : #'NewTools-SystemBrowser-Model'
+	#category : 'NewTools-SystemBrowser-Model',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSBPackageModel class >> newEnvironment: anEnvironment package: aPackage [
 
 	^ self new 
@@ -16,7 +18,7 @@ StSBPackageModel class >> newEnvironment: anEnvironment package: aPackage [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageModel >> allClassesQueries [
 
 	^ {
@@ -25,7 +27,7 @@ StSBPackageModel >> allClassesQueries [
 	}
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageModel >> children [
 
 	^ (self tagsQuery execute items 
@@ -33,7 +35,7 @@ StSBPackageModel >> children [
 		sorted: #name ascending 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageModel >> classes [
 
 	^ self allClassesQueries 
@@ -43,29 +45,29 @@ StSBPackageModel >> classes [
 				collect: [ :each | StSBClassModel newEnvironment: self environment class: each ]) ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageModel >> icon [
 
 	^ self application iconNamed: #package
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageModel >> name [
 
 	^ self package name
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageModel >> package [
 	^ package
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageModel >> package: anObject [
 	package := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageModel >> tagsQuery [
 		
 	^ ClyAllClassGroupsQuery sortedFrom: (ClyPackageScope of: self package in: self environment)
diff --git a/src/NewTools-SystemBrowser/StSBPackageTagModel.class.st b/src/NewTools-SystemBrowser/StSBPackageTagModel.class.st
index c4e9d3360..e01261ab5 100644
--- a/src/NewTools-SystemBrowser/StSBPackageTagModel.class.st
+++ b/src/NewTools-SystemBrowser/StSBPackageTagModel.class.st
@@ -1,13 +1,15 @@
 Class {
-	#name : #StSBPackageTagModel,
-	#superclass : #StSBBasePackageModel,
+	#name : 'StSBPackageTagModel',
+	#superclass : 'StSBBasePackageModel',
 	#instVars : [
 		'classGroup'
 	],
-	#category : #'NewTools-SystemBrowser-Model'
+	#category : 'NewTools-SystemBrowser-Model',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSBPackageTagModel class >> newEnvironment: anEnvironment classGroup: aPackageTag [ 
 
 	^ self new
@@ -16,25 +18,25 @@ StSBPackageTagModel class >> newEnvironment: anEnvironment classGroup: aPackageT
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageTagModel >> children [
 
 	^ #()
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageTagModel >> classGroup [
 	
 	^ classGroup
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageTagModel >> classGroup: aClassGroup [
 
 	classGroup := aClassGroup
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageTagModel >> classes [
 
 	^ self classGroup classes collect: [ :each | 
@@ -43,13 +45,13 @@ StSBPackageTagModel >> classes [
 			class: each ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageTagModel >> comment [
 
 	^ self package packageComment
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageTagModel >> fullName [
 
 	^ self package classTags
@@ -58,13 +60,13 @@ StSBPackageTagModel >> fullName [
 		ifNone: [ self package name ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackageTagModel >> name [
 
 	^ self classGroup name
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StSBPackageTagModel >> package [
 
 	self flag: #REVIEW. "This is like thois because calypso does not attach the tag query 
diff --git a/src/NewTools-SystemBrowser/StSBPackagesPanel.class.st b/src/NewTools-SystemBrowser/StSBPackagesPanel.class.st
index a2a0080a3..eaa2a654a 100644
--- a/src/NewTools-SystemBrowser/StSBPackagesPanel.class.st
+++ b/src/NewTools-SystemBrowser/StSBPackagesPanel.class.st
@@ -1,13 +1,15 @@
 Class {
-	#name : #StSBPackagesPanel,
-	#superclass : #StSBPanel,
+	#name : 'StSBPackagesPanel',
+	#superclass : 'StSBPanel',
 	#instVars : [
 		'packageTree'
 	],
-	#category : #'NewTools-SystemBrowser-View'
+	#category : 'NewTools-SystemBrowser-View',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'View'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSBPackagesPanel class >> defaultSpec [
 
 	^ SpBoxLayout newVertical 
@@ -15,19 +17,19 @@ StSBPackagesPanel class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBPackagesPanel >> defaultInputPort [
 
 	^ self inputItemsPort
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBPackagesPanel >> defaultOutputPort [
 
 	^ self outputSelectionPort
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackagesPanel >> gotoPackage: aPackage [
 	| roots packageModel |
 
@@ -39,7 +41,7 @@ StSBPackagesPanel >> gotoPackage: aPackage [
 	self packageTree selectPath: { roots indexOf: packageModel }
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBPackagesPanel >> initializePresenters [
 	
 	packageTree := self newTreeTable
@@ -52,7 +54,7 @@ StSBPackagesPanel >> initializePresenters [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBPackagesPanel >> inputItemsPort [
 
 	^ (SpListItemsPort newPresenter: self) 
@@ -60,7 +62,7 @@ StSBPackagesPanel >> inputItemsPort [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBPackagesPanel >> outputSelectionPort [
 	
 	^ (SpSelectionPort newPresenter: self)
@@ -68,7 +70,7 @@ StSBPackagesPanel >> outputSelectionPort [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBPackagesPanel >> packageTree [
 	^ packageTree
 ]
diff --git a/src/NewTools-SystemBrowser/StSBPanel.class.st b/src/NewTools-SystemBrowser/StSBPanel.class.st
index 889b84eff..84950b99b 100644
--- a/src/NewTools-SystemBrowser/StSBPanel.class.st
+++ b/src/NewTools-SystemBrowser/StSBPanel.class.st
@@ -1,19 +1,21 @@
 Class {
-	#name : #StSBPanel,
-	#superclass : #StPresenter,
+	#name : 'StSBPanel',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'model'
 	],
-	#category : #'NewTools-SystemBrowser-View'
+	#category : 'NewTools-SystemBrowser-View',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'View'
 }
 
-{ #category : #'accessing model' }
+{ #category : 'accessing model' }
 StSBPanel >> model [
 
 	^ model
 ]
 
-{ #category : #'accessing model' }
+{ #category : 'accessing model' }
 StSBPanel >> setModelBeforeInitialization: anEnvironmentModel [
 
 	model := anEnvironmentModel
diff --git a/src/NewTools-SystemBrowser/StSBProtocolInspectionPanel.class.st b/src/NewTools-SystemBrowser/StSBProtocolInspectionPanel.class.st
index 6e3e090ba..2b4c90fd5 100644
--- a/src/NewTools-SystemBrowser/StSBProtocolInspectionPanel.class.st
+++ b/src/NewTools-SystemBrowser/StSBProtocolInspectionPanel.class.st
@@ -1,14 +1,16 @@
 Class {
-	#name : #StSBProtocolInspectionPanel,
-	#superclass : #StSBPanel,
+	#name : 'StSBProtocolInspectionPanel',
+	#superclass : 'StSBPanel',
 	#instVars : [
 		'protocolList',
 		'methodList'
 	],
-	#category : #'NewTools-SystemBrowser-View'
+	#category : 'NewTools-SystemBrowser-View',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'View'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSBProtocolInspectionPanel class >> defaultSpec [
 
 	^ SpPanedLayout newHorizontal
@@ -17,19 +19,19 @@ StSBProtocolInspectionPanel class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBProtocolInspectionPanel >> defaultInputPort [
 
 	^ self inputItemsPort
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBProtocolInspectionPanel >> defaultOutputPort [
 
 	^ self outputSelectionPort
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBProtocolInspectionPanel >> initializePresenters [
 	
 	protocolList := self newTable 
@@ -46,7 +48,7 @@ StSBProtocolInspectionPanel >> initializePresenters [
 	protocolList whenModelChangedDo: [ methodList items: #() ].
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBProtocolInspectionPanel >> inputItemsPort [
 
 	^ (SpListItemsPort newPresenter: self) 
@@ -54,7 +56,7 @@ StSBProtocolInspectionPanel >> inputItemsPort [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBProtocolInspectionPanel >> inputMethodItemsPort [
 
 	^ (SpListItemsPort newPresenter: self) 
@@ -62,12 +64,12 @@ StSBProtocolInspectionPanel >> inputMethodItemsPort [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBProtocolInspectionPanel >> methodList [
 	^ methodList
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBProtocolInspectionPanel >> outputProtocolSelectionPort [
 	
 	^ (SpSelectionPort newPresenter: self)
@@ -75,7 +77,7 @@ StSBProtocolInspectionPanel >> outputProtocolSelectionPort [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBProtocolInspectionPanel >> outputSelectionPort [
 	
 	^ (SpSelectionPort newPresenter: self)
@@ -83,7 +85,7 @@ StSBProtocolInspectionPanel >> outputSelectionPort [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBProtocolInspectionPanel >> protocolList [
 	^ protocolList
 ]
diff --git a/src/NewTools-SystemBrowser/StSBProtocolModel.class.st b/src/NewTools-SystemBrowser/StSBProtocolModel.class.st
index bfa7ad2ea..6f370cbb8 100644
--- a/src/NewTools-SystemBrowser/StSBProtocolModel.class.st
+++ b/src/NewTools-SystemBrowser/StSBProtocolModel.class.st
@@ -1,13 +1,15 @@
 Class {
-	#name : #StSBProtocolModel,
-	#superclass : #StSBModel,
+	#name : 'StSBProtocolModel',
+	#superclass : 'StSBModel',
 	#instVars : [
 		'protocol'
 	],
-	#category : #'NewTools-SystemBrowser-Model'
+	#category : 'NewTools-SystemBrowser-Model',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSBProtocolModel class >> newEnvironment: anEnvironment protocol: aProtocol [
 
 	^ self new 
@@ -16,7 +18,7 @@ StSBProtocolModel class >> newEnvironment: anEnvironment protocol: aProtocol [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBProtocolModel >> methods [
 
 	^ (self protocol methods 
@@ -27,18 +29,18 @@ StSBProtocolModel >> methods [
 		sorted: #name ascending
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBProtocolModel >> name [
 
 	^ self protocol name
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBProtocolModel >> protocol [
 	^ protocol
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBProtocolModel >> protocol: anObject [
 	protocol := anObject
 ]
diff --git a/src/NewTools-SystemBrowser/StSBVariableInspectionPanel.class.st b/src/NewTools-SystemBrowser/StSBVariableInspectionPanel.class.st
index de6aa2dd3..58aedfed5 100644
--- a/src/NewTools-SystemBrowser/StSBVariableInspectionPanel.class.st
+++ b/src/NewTools-SystemBrowser/StSBVariableInspectionPanel.class.st
@@ -1,14 +1,16 @@
 Class {
-	#name : #StSBVariableInspectionPanel,
-	#superclass : #StSBPanel,
+	#name : 'StSBVariableInspectionPanel',
+	#superclass : 'StSBPanel',
 	#instVars : [
 		'methodList',
 		'variableList'
 	],
-	#category : #'NewTools-SystemBrowser-View'
+	#category : 'NewTools-SystemBrowser-View',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'View'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSBVariableInspectionPanel class >> defaultSpec [
 
 	^ SpPanedLayout newHorizontal
@@ -17,19 +19,19 @@ StSBVariableInspectionPanel class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBVariableInspectionPanel >> defaultInputPort [
 
 	^ self inputItemsPort
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBVariableInspectionPanel >> defaultOutputPort [
 
 	^ self outputSelectionPort
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBVariableInspectionPanel >> initializePresenters [
 	
 	variableList := self newTable 
@@ -46,7 +48,7 @@ StSBVariableInspectionPanel >> initializePresenters [
 	variableList whenModelChangedDo: [ methodList items: #() ].	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBVariableInspectionPanel >> inputItemsPort [
 
 	^ (SpListItemsPort newPresenter: self) 
@@ -54,7 +56,7 @@ StSBVariableInspectionPanel >> inputItemsPort [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBVariableInspectionPanel >> inputMethodItemsPort [
 
 	^ (SpListItemsPort newPresenter: self) 
@@ -62,12 +64,12 @@ StSBVariableInspectionPanel >> inputMethodItemsPort [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBVariableInspectionPanel >> methodList [
 	^ methodList
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBVariableInspectionPanel >> outputSelectionPort [
 	
 	^ (SpSelectionPort newPresenter: self)
@@ -75,7 +77,7 @@ StSBVariableInspectionPanel >> outputSelectionPort [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSBVariableInspectionPanel >> outputVariableSelectionPort [
 	
 	^ (SpSelectionPort newPresenter: self)
@@ -83,7 +85,7 @@ StSBVariableInspectionPanel >> outputVariableSelectionPort [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBVariableInspectionPanel >> variableList [
 	^ variableList
 ]
diff --git a/src/NewTools-SystemBrowser/StSBVariableModel.class.st b/src/NewTools-SystemBrowser/StSBVariableModel.class.st
index c5119752e..bcc793f4e 100644
--- a/src/NewTools-SystemBrowser/StSBVariableModel.class.st
+++ b/src/NewTools-SystemBrowser/StSBVariableModel.class.st
@@ -1,13 +1,15 @@
 Class {
-	#name : #StSBVariableModel,
-	#superclass : #StSBModel,
+	#name : 'StSBVariableModel',
+	#superclass : 'StSBModel',
 	#instVars : [
 		'slot'
 	],
-	#category : #'NewTools-SystemBrowser-Model'
+	#category : 'NewTools-SystemBrowser-Model',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSBVariableModel >> name [
 
 	^ slot name
diff --git a/src/NewTools-SystemBrowser/StSystemBrowser.class.st b/src/NewTools-SystemBrowser/StSystemBrowser.class.st
index f95a02100..26213d9f4 100644
--- a/src/NewTools-SystemBrowser/StSystemBrowser.class.st
+++ b/src/NewTools-SystemBrowser/StSystemBrowser.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #StSystemBrowser,
-	#superclass : #StPresenter,
+	#name : 'StSystemBrowser',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'model',
 		'inspectionPanel',
@@ -18,16 +18,18 @@ Class {
 		'selectedClass',
 		'selectedMethod'
 	],
-	#category : #'NewTools-SystemBrowser-View'
+	#category : 'NewTools-SystemBrowser-View',
+	#package : 'NewTools-SystemBrowser',
+	#tag : 'View'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 StSystemBrowser class >> defaultEnvironment [
 	
 	^ ClyNavigationEnvironment currentImage
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StSystemBrowser class >> defaultSpec [
 
 	^ SpPanedLayout newVertical
@@ -42,32 +44,32 @@ StSystemBrowser class >> defaultSpec [
 		yourself
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSystemBrowser class >> onDefaultEnvironment [
 
 	^ self on: (StSBEnvironmentModel newEnvironment: self defaultEnvironment)
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StSystemBrowser class >> onEnvironment: anEnvironment [
 
 	^ self on: (StSBEnvironmentModel newEnvironment: anEnvironment)
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 StSystemBrowser class >> open [
 	<script>
 
 	^ self openOn: self defaultEnvironment
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 StSystemBrowser class >> openOn: anEnvironment [
 
 	^ (self onEnvironment: (StSBEnvironmentModel newEnvironment: anEnvironment)) openWithSpec
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 StSystemBrowser class >> openOnClass: aClass [
 	| browser |
 
@@ -76,7 +78,7 @@ StSystemBrowser class >> openOnClass: aClass [
 	^ browser openWithSpec
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 StSystemBrowser class >> openOnPackage: aPackage [
 	| browser |
 
@@ -85,37 +87,37 @@ StSystemBrowser class >> openOnPackage: aPackage [
 	^ browser openWithSpec
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSystemBrowser class >> preferredExtent [
 
 	^ 880@650
 ]
 
-{ #category : #'private selecting' }
+{ #category : 'private selecting' }
 StSystemBrowser >> basicSelectClass:  aClassModel [
 		
 	selectedClass := aClassModel
 ]
 
-{ #category : #'private selecting' }
+{ #category : 'private selecting' }
 StSystemBrowser >> basicSelectMethod:  aMethodModel [
 		
 	selectedMethod := aMethodModel
 ]
 
-{ #category : #'private selecting' }
+{ #category : 'private selecting' }
 StSystemBrowser >> basicSelectPackage: aPackageModel [
 		
 	selectedPackage := aPackageModel
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSystemBrowser >> buildStatusBar [
 
 	^ SpStatusBarPresenter new
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSystemBrowser >> buildToolbar [
 
 	^ CmCommandGroup forSpec
@@ -127,7 +129,7 @@ StSystemBrowser >> buildToolbar [
 				addStyle: 'stToolbar' ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSystemBrowser >> connectPresenters [
 
 	packagesPanel transmitTo: classesPanel transform: #classes.
@@ -143,20 +145,20 @@ StSystemBrowser >> connectPresenters [
 	variablesPanel transmitDo: [ :selection | self selectMethod: selection ].
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSystemBrowser >> gotoClass: aClass [
 
 	self gotoPackage: aClass package.
 	classesPanel gotoClass: aClass
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSystemBrowser >> gotoPackage: aPackage [
 
 	packagesPanel gotoPackage: aPackage 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSystemBrowser >> initialTitle [
 		
 	self selectedClass ifNotNil: [ :aClass | ^ self titleFor: aClass ].
@@ -165,7 +167,7 @@ StSystemBrowser >> initialTitle [
 	^ 'System Browser'	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSystemBrowser >> initializePresenters [
 	
 	packagesPanel := self instantiate: StSBPackagesPanel on: self model.
@@ -183,7 +185,7 @@ StSystemBrowser >> initializePresenters [
 	codePanel := self newNotebook
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSystemBrowser >> initializeWindow: aWindowPresenter [
 
 	super initializeWindow: aWindowPresenter.
@@ -194,13 +196,13 @@ StSystemBrowser >> initializeWindow: aWindowPresenter [
 		statusBar: (statusBar := self buildStatusBar)
 ]
 
-{ #category : #'accessing model' }
+{ #category : 'accessing model' }
 StSystemBrowser >> model [ 
 
 	^ model
 ]
 
-{ #category : #'private factory' }
+{ #category : 'private factory' }
 StSystemBrowser >> newClassTemplateForPackage: aPackageModel [
 
 	^ self newCode
@@ -208,7 +210,7 @@ StSystemBrowser >> newClassTemplateForPackage: aPackageModel [
 		yourself
 ]
 
-{ #category : #'private factory' }
+{ #category : 'private factory' }
 StSystemBrowser >> newCommentFor: aModel [
 
 	^ self newCode
@@ -218,7 +220,7 @@ StSystemBrowser >> newCommentFor: aModel [
 		
 ]
 
-{ #category : #'private factory' }
+{ #category : 'private factory' }
 StSystemBrowser >> newDefinitionFor: aModel [
 
 	^ self newCode
@@ -227,7 +229,7 @@ StSystemBrowser >> newDefinitionFor: aModel [
 		yourself
 ]
 
-{ #category : #'private factory' }
+{ #category : 'private factory' }
 StSystemBrowser >> newMethodTemplateForClass: aClassModel [
 
 	^ self newCode
@@ -235,7 +237,7 @@ StSystemBrowser >> newMethodTemplateForClass: aClassModel [
 		yourself
 ]
 
-{ #category : #'private factory' }
+{ #category : 'private factory' }
 StSystemBrowser >> newPage: aString provider: aBlock [
 	
 	^ self newNotebookPage
@@ -244,7 +246,7 @@ StSystemBrowser >> newPage: aString provider: aBlock [
 		yourself
 ]
 
-{ #category : #'private selecting' }
+{ #category : 'private selecting' }
 StSystemBrowser >> selectClass: aClassModel [
 
 	self basicSelectClass: aClassModel.
@@ -263,7 +265,7 @@ StSystemBrowser >> selectClass: aClassModel [
 		selectPageIndex: 2
 ]
 
-{ #category : #'private selecting' }
+{ #category : 'private selecting' }
 StSystemBrowser >> selectMethod: aMethodModel [
 
 	self basicSelectMethod: aMethodModel.
@@ -282,7 +284,7 @@ StSystemBrowser >> selectMethod: aMethodModel [
 		selectPageIndex: 3
 ]
 
-{ #category : #'private selecting' }
+{ #category : 'private selecting' }
 StSystemBrowser >> selectPackage: aPackage [
 
 	self basicSelectPackage: aPackage.
@@ -297,31 +299,31 @@ StSystemBrowser >> selectPackage: aPackage [
 			provider: [ self newClassTemplateForPackage: self selectedPackage ])
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSystemBrowser >> selectedClass [
 
 	^ selectedClass
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSystemBrowser >> selectedMethod [
 		
 	^ selectedMethod
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSystemBrowser >> selectedPackage [
 
 	^ selectedPackage
 ]
 
-{ #category : #'accessing model' }
+{ #category : 'accessing model' }
 StSystemBrowser >> setModelBeforeInitialization: anEnvironment [
 
 	model := anEnvironment
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSystemBrowser >> titleFor: aModel [
 
 	^ aModel windowTitle
diff --git a/src/NewTools-SystemBrowser/package.st b/src/NewTools-SystemBrowser/package.st
index 914d559da..f0f6a55ef 100644
--- a/src/NewTools-SystemBrowser/package.st
+++ b/src/NewTools-SystemBrowser/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-SystemBrowser' }
+Package { #name : 'NewTools-SystemBrowser' }
diff --git a/src/NewTools-SystemReporter/StReporter.class.st b/src/NewTools-SystemReporter/StReporter.class.st
index 770d53e8b..ff52a9e26 100644
--- a/src/NewTools-SystemReporter/StReporter.class.st
+++ b/src/NewTools-SystemReporter/StReporter.class.st
@@ -1,10 +1,12 @@
 Class {
-	#name : #StReporter,
-	#superclass : #StReporterPresenter,
-	#category : #'NewTools-SystemReporter-Deprecated'
+	#name : 'StReporter',
+	#superclass : 'StReporterPresenter',
+	#category : 'NewTools-SystemReporter-Deprecated',
+	#package : 'NewTools-SystemReporter',
+	#tag : 'Deprecated'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StReporter class >> isDeprecated [ 
 
 	^ true
diff --git a/src/NewTools-SystemReporter/StReporterPresenter.class.st b/src/NewTools-SystemReporter/StReporterPresenter.class.st
index a44660e38..0b22d5ed2 100644
--- a/src/NewTools-SystemReporter/StReporterPresenter.class.st
+++ b/src/NewTools-SystemReporter/StReporterPresenter.class.st
@@ -15,17 +15,19 @@ StSizeReporter new open
 
 "
 Class {
-	#name : #StReporterPresenter,
-	#superclass : #StPresenter,
+	#name : 'StReporterPresenter',
+	#superclass : 'StPresenter',
 	#instVars : [
 		'topicList',
 		'reportText',
 		'topics'
 	],
-	#category : #'NewTools-SystemReporter-Base'
+	#category : 'NewTools-SystemReporter-Base',
+	#package : 'NewTools-SystemReporter',
+	#tag : 'Base'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 StReporterPresenter class >> defaultLayout [
 	"self open"
 	^ (SpBoxLayout newLeftToRight 
@@ -34,20 +36,20 @@ StReporterPresenter class >> defaultLayout [
 			yourself)
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StReporterPresenter class >> open [
 
 	<script>
 	self new open
 ]
 
-{ #category : #adding }
+{ #category : 'adding' }
 StReporterPresenter >> addTopicSpec: aPair [
 
 	topics add: aPair
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StReporterPresenter >> connectPresenters [  
 	
 	topicList whenSelectionChangedDo: [ :selection | 
@@ -58,7 +60,7 @@ StReporterPresenter >> connectPresenters [
 	topicList items: topics
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StReporterPresenter >> createTextForReport: items [
 
 	^ (Text streamContents: [:stream | 
@@ -67,7 +69,7 @@ StReporterPresenter >> createTextForReport: items [
 								stream cr]])
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 StReporterPresenter >> enumerate: aBlock on: aStream [
 
 	self 
@@ -76,7 +78,7 @@ StReporterPresenter >> enumerate: aBlock on: aStream [
 		on: aStream
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 StReporterPresenter >> enumerate: aBlock startAt: first on: aStream [
 	"Utility method to enumerate Options or Parameters from first to 1000"
 
@@ -100,13 +102,13 @@ StReporterPresenter >> enumerate: aBlock startAt: first on: aStream [
 				cr ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StReporterPresenter >> fillTopics [
 
 	^ self
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 StReporterPresenter >> header: aString on: aStream [
 	aStream
 		withAttribute: TextEmphasis bold
@@ -117,7 +119,7 @@ StReporterPresenter >> header: aString on: aStream [
 			aStream cr ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StReporterPresenter >> initialize [
 	topics := OrderedCollection new.
 	self fillTopics.
@@ -125,7 +127,7 @@ StReporterPresenter >> initialize [
 	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StReporterPresenter >> initializePresenters [ 
 
 	topicList := self newList.
@@ -134,14 +136,14 @@ StReporterPresenter >> initializePresenters [
 	reportText := self newText beNotEditable.
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StReporterPresenter >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter title: self title.
 	aWindowPresenter initialExtent: self extent
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StReporterPresenter >> topicSpec [
 
 	^ topics
diff --git a/src/NewTools-SystemReporter/StSizeReporter.class.st b/src/NewTools-SystemReporter/StSizeReporter.class.st
index d132e459d..0586b4547 100644
--- a/src/NewTools-SystemReporter/StSizeReporter.class.st
+++ b/src/NewTools-SystemReporter/StSizeReporter.class.st
@@ -1,10 +1,12 @@
 Class {
-	#name : #StSizeReporter,
-	#superclass : #StSizeReporterPresenter,
-	#category : #'NewTools-SystemReporter-Deprecated'
+	#name : 'StSizeReporter',
+	#superclass : 'StSizeReporterPresenter',
+	#category : 'NewTools-SystemReporter-Deprecated',
+	#package : 'NewTools-SystemReporter',
+	#tag : 'Deprecated'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSizeReporter class >> isDeprecated [
 
 	^ true
diff --git a/src/NewTools-SystemReporter/StSizeReporterPresenter.class.st b/src/NewTools-SystemReporter/StSizeReporterPresenter.class.st
index 25818d354..f5550560f 100644
--- a/src/NewTools-SystemReporter/StSizeReporterPresenter.class.st
+++ b/src/NewTools-SystemReporter/StSizeReporterPresenter.class.st
@@ -7,26 +7,28 @@ StSizeReporter new open
 
 "
 Class {
-	#name : #StSizeReporterPresenter,
-	#superclass : #StReporterPresenter,
+	#name : 'StSizeReporterPresenter',
+	#superclass : 'StReporterPresenter',
 	#instVars : [
 		'data'
 	],
-	#category : #'NewTools-SystemReporter-Base'
+	#category : 'NewTools-SystemReporter-Base',
+	#package : 'NewTools-SystemReporter',
+	#tag : 'Base'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSizeReporterPresenter >> baselineClassLoc [
 	^ data at: #baselineClassLoc ifAbsent: [ self computeLocs. data at: #baselineClassLoc ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSizeReporterPresenter >> baselineClasses [
 
 	^ data at: #baselineClasses
 ]
 
-{ #category : #compute }
+{ #category : 'compute' }
 StSizeReporterPresenter >> computeLocs [ 
 
 	data at: #manifestClassLoc put:  (self manifestClasses inject: 0 into: [ :sum :each | sum + each linesOfCode]).
@@ -36,7 +38,7 @@ StSizeReporterPresenter >> computeLocs [
 	data at: #effectiveClassLoc put: self imageClassLoc - self baselineClassLoc - self manifestClassLoc - self testClassLoc
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSizeReporterPresenter >> effectiveClassLoc [
 
 	^ data at: #effectiveClassLoc ifAbsentPut: [ self computeLocs. 
@@ -44,25 +46,25 @@ StSizeReporterPresenter >> effectiveClassLoc [
 	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSizeReporterPresenter >> effectiveClassPackages [
 
 	^ data at: #effectiveClassPackages
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSizeReporterPresenter >> effectiveClasses [
 
 	^ data at: #effectiveClasses
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSizeReporterPresenter >> extent [
 
 	^ 600@ 400
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSizeReporterPresenter >> fillTopics [
 
   {	#'# smart report' -> #reportSmartInfo: .
@@ -74,24 +76,24 @@ StSizeReporterPresenter >> fillTopics [
 		 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSizeReporterPresenter >> imageClassLoc [ 
 	^ data at: #imageClassLoc  ifAbsent: [ self computeLocs. data at: #imageClassLoc ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSizeReporterPresenter >> imageClassPackages [
 
 	^ data at: #imageClassPackages
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSizeReporterPresenter >> imageClasses [
 
 	^ data at: #imageClasses
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSizeReporterPresenter >> initialize [ 
 	super initialize.
 	data := Dictionary new. 
@@ -113,20 +115,20 @@ StSizeReporterPresenter >> initialize [
 	topicList selectIndex: 1.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSizeReporterPresenter >> manifestClassLoc [
 
 	^ data at: #manifestClassLoc ifAbsent: [ self computeLocs. data at: #manifestClassLoc ]
 	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSizeReporterPresenter >> manifestClasses [
 
 	^ data at: #manifestClasses
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 StSizeReporterPresenter >> printNumber: aNumber on: aStream [
 
 	aNumber
@@ -136,7 +138,7 @@ StSizeReporterPresenter >> printNumber: aNumber on: aStream [
 		on: aStream
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSizeReporterPresenter >> reportLOC: aStream [
 	
 	self header: 'Number of LinesOfCode' on: aStream.
@@ -159,7 +161,7 @@ StSizeReporterPresenter >> reportLOC: aStream [
 	aStream print: (self effectiveClassLoc / self effectiveClasses size) asFloat rounded
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSizeReporterPresenter >> reportNbClasses: aStream [
 
 	self header: 'Number of classes' on: aStream.
@@ -177,7 +179,7 @@ StSizeReporterPresenter >> reportNbClasses: aStream [
 		
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSizeReporterPresenter >> reportNbTraits: aStream [
 	| imageTraits |
 	imageTraits := self class environment allTraits.
@@ -189,7 +191,7 @@ StSizeReporterPresenter >> reportNbTraits: aStream [
 
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSizeReporterPresenter >> reportSmartInfo: aStream [
 
 	self header: 'Smarter data' on: aStream.
@@ -216,26 +218,26 @@ StSizeReporterPresenter >> reportSmartInfo: aStream [
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSizeReporterPresenter >> testClassLoc [
 
 	^ data at: #testClassLoc ifAbsent: [ self computeLocs. data at: #testClassLoc ]
 	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StSizeReporterPresenter >> testClasses [
 
 	^ data at: #testClasses
 ]
 
-{ #category : #ui }
+{ #category : 'ui' }
 StSizeReporterPresenter >> title [ 
 
 	^ 'Size reporter'
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSizeReporterPresenter >> topicSpec [
   {	#'# smart report' -> #reportSmartInfo: .
 	#'# raw classes' -> #reportNbClasses:  .
diff --git a/src/NewTools-SystemReporter/StSystemReporter.class.st b/src/NewTools-SystemReporter/StSystemReporter.class.st
index c39bd94a7..7338b6848 100644
--- a/src/NewTools-SystemReporter/StSystemReporter.class.st
+++ b/src/NewTools-SystemReporter/StSystemReporter.class.st
@@ -1,10 +1,12 @@
 Class {
-	#name : #StSystemReporter,
-	#superclass : #StSystemReporterPresenter,
-	#category : #'NewTools-SystemReporter-Deprecated'
+	#name : 'StSystemReporter',
+	#superclass : 'StSystemReporterPresenter',
+	#category : 'NewTools-SystemReporter-Deprecated',
+	#package : 'NewTools-SystemReporter',
+	#tag : 'Deprecated'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StSystemReporter class >> isDeprecated [
 
 	^ true
diff --git a/src/NewTools-SystemReporter/StSystemReporterPresenter.class.st b/src/NewTools-SystemReporter/StSystemReporterPresenter.class.st
index 6278c041e..397a4ecc5 100644
--- a/src/NewTools-SystemReporter/StSystemReporterPresenter.class.st
+++ b/src/NewTools-SystemReporter/StSystemReporterPresenter.class.st
@@ -9,12 +9,14 @@ StSystemReporter open
 
 "
 Class {
-	#name : #StSystemReporterPresenter,
-	#superclass : #StReporterPresenter,
-	#category : #'NewTools-SystemReporter-Base'
+	#name : 'StSystemReporterPresenter',
+	#superclass : 'StReporterPresenter',
+	#category : 'NewTools-SystemReporter-Base',
+	#package : 'NewTools-SystemReporter',
+	#tag : 'Base'
 }
 
-{ #category : #'system menu' }
+{ #category : 'system menu' }
 StSystemReporterPresenter class >> systemReporterMenuOn: aBuilder [ 
 	<worldMenu>
 	
@@ -25,20 +27,20 @@ StSystemReporterPresenter class >> systemReporterMenuOn: aBuilder [
 		help: 'If you have a bug, use this tool to provide information about your system.'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSystemReporterPresenter >> connectPresenters [ 
 
 	super connectPresenters.
 	topicList  selectIndex: 1.
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 StSystemReporterPresenter >> extent [
 
 	^ 500@ 600
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSystemReporterPresenter >> fillTopics [ 
 	
 	 {
@@ -68,25 +70,25 @@ StSystemReporterPresenter >> fillTopics [
 	^ topics
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 StSystemReporterPresenter >> isLinux [
 	
 	^Smalltalk os isLinux
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 StSystemReporterPresenter >> isWindows [
 
 	^Smalltalk os isWindows
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> readContentsSafelyFromFile: osPath andWriteTo: aStream [
 	 [ osPath asFileReference readStreamDo: [:s | aStream nextPutAll: s contents ]
     ] on: Error do: [:ex| ex return: ex printString]
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportImage: aStream [
 	self header: 'Image' on: aStream.
 	aStream 
@@ -97,13 +99,13 @@ StSystemReporterPresenter >> reportImage: aStream [
 
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportImageParameters: aStream [
 	self header: 'Image Commandline Parameters' on: aStream.
 	self enumerate: [:idx | Smalltalk image argumentAt: idx] on: aStream
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportLinuxOSDetails: aStream [
 	self header: 'Operating System Details' on: aStream.
 	#(
@@ -114,7 +116,7 @@ StSystemReporterPresenter >> reportLinuxOSDetails: aStream [
 		self readContentsSafelyFromFile: path andWriteTo: aStream]
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportModules: aStream [
 
 	self header: 'Loaded VM Modules' on: aStream.
@@ -126,7 +128,7 @@ StSystemReporterPresenter >> reportModules: aStream [
 
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportOS: aStream [
 	self header: 'Operating System/Hardware' on: aStream.
 	aStream
@@ -136,7 +138,7 @@ StSystemReporterPresenter >> reportOS: aStream [
 
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportOSEnvironment: aStream [
 	| env |
 	self header: 'Operating System Environment' on: aStream.
@@ -145,14 +147,14 @@ StSystemReporterPresenter >> reportOSEnvironment: aStream [
 		aStream nextPutAll: name; nextPut: $=; nextPutAll: (env at: name); cr ]
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportSources: aStream [
 	self header: 'Image Sources' on: aStream.
 	aStream nextPutAll: SourceFiles class printString; cr.
 	aStream nextPutAll: SourceFiles reportString.
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportVM: aStream [
 	self header: 'Virtual Machine' on: aStream.
 	aStream
@@ -204,13 +206,13 @@ StSystemReporterPresenter >> reportVM: aStream [
 			 ]
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportVMOptions: aStream [
 	self header: 'Virtual Machine Commandline Options' on: aStream.
 	self enumerate: [:idx | Smalltalk vm optionAt: idx] startAt: 1 on: aStream
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportVMParameters: aStream [
 	| vmParameters |
 	self header: 'Virtual Machine Parameters' on: aStream.
@@ -227,32 +229,32 @@ StSystemReporterPresenter >> reportVMParameters: aStream [
 			cr]
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportVMStats: aStream [
 	self header: 'Virtual Machine Statistics' on: aStream.
 	aStream
 		nextPutAll: Smalltalk vm statisticsReport
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportWin32GFXDetails: aStream [
 	self header: 'Graphics Hardware Details' on: aStream.
 	aStream nextPutAll: (Smalltalk vm getSystemAttribute: 10003)
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportWin32HardwareDetails: aStream [
 	self header: 'Hardware Details' on: aStream.
 	aStream nextPutAll: (Smalltalk vm getSystemAttribute: 10001)
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportWin32OSDetails: aStream [
 	self header: 'Operating System Details' on: aStream.
 	aStream nextPutAll: (Smalltalk vm getSystemAttribute: 10002)
 ]
 
-{ #category : #'building report' }
+{ #category : 'building report' }
 StSystemReporterPresenter >> reportWin32VMConfig: aStream [
 	| exePath iniPath |
 	self header: 'VM Configuration' on: aStream.
@@ -263,12 +265,12 @@ StSystemReporterPresenter >> reportWin32VMConfig: aStream [
 
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 StSystemReporterPresenter >> title [ 
 	^ 'System Reporter'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StSystemReporterPresenter >> topicSpec [
 	
 	topics addAll:  {
diff --git a/src/NewTools-SystemReporter/package.st b/src/NewTools-SystemReporter/package.st
index 1dcfcb6d1..04eff9440 100644
--- a/src/NewTools-SystemReporter/package.st
+++ b/src/NewTools-SystemReporter/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-SystemReporter' }
+Package { #name : 'NewTools-SystemReporter' }