diff --git a/src/NewTools-Debugger/ArgumentVariable.extension.st b/src/NewTools-Debugger/ArgumentVariable.extension.st
index 2423398fe..e07227899 100644
--- a/src/NewTools-Debugger/ArgumentVariable.extension.st
+++ b/src/NewTools-Debugger/ArgumentVariable.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #ArgumentVariable }
+Extension { #name : 'ArgumentVariable' }
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 ArgumentVariable >> variableTag [
 	^ 'arg'
 ]
diff --git a/src/NewTools-Debugger/CmAbstractCommandsGroup.extension.st b/src/NewTools-Debugger/CmAbstractCommandsGroup.extension.st
index 43ece7df3..ff458a978 100644
--- a/src/NewTools-Debugger/CmAbstractCommandsGroup.extension.st
+++ b/src/NewTools-Debugger/CmAbstractCommandsGroup.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #CmAbstractCommandsGroup }
+Extension { #name : 'CmAbstractCommandsGroup' }
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 CmAbstractCommandsGroup >> commandOrGroupNamed: aString ifNone: aBlock [
 	self subclassResponsibility 
 ]
diff --git a/src/NewTools-Debugger/CmCommandGroup.extension.st b/src/NewTools-Debugger/CmCommandGroup.extension.st
index b7cb6b0c6..cb8390bc6 100644
--- a/src/NewTools-Debugger/CmCommandGroup.extension.st
+++ b/src/NewTools-Debugger/CmCommandGroup.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #CmCommandGroup }
+Extension { #name : 'CmCommandGroup' }
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 CmCommandGroup >> commandOrGroupNamed: aString ifNone: aBlock [
 	^ entries
 		detect: [ :commandOrRegister | commandOrRegister name = aString ]
diff --git a/src/NewTools-Debugger/CmCommandGroupDecorator.extension.st b/src/NewTools-Debugger/CmCommandGroupDecorator.extension.st
index d304ff7d0..0e78f1f00 100644
--- a/src/NewTools-Debugger/CmCommandGroupDecorator.extension.st
+++ b/src/NewTools-Debugger/CmCommandGroupDecorator.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #CmCommandGroupDecorator }
+Extension { #name : 'CmCommandGroupDecorator' }
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 CmCommandGroupDecorator >> commandOrGroupNamed: aString ifNone: aBlock [
 	^ self decoratedGroup commandOrGroupNamed: aString ifNone: aBlock
 ]
diff --git a/src/NewTools-Debugger/Context.extension.st b/src/NewTools-Debugger/Context.extension.st
index a27c0726c..f94b71a4b 100644
--- a/src/NewTools-Debugger/Context.extension.st
+++ b/src/NewTools-Debugger/Context.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #Context }
+Extension { #name : 'Context' }
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 Context >> findFailedAssertionContextInSenderChain [
 
 	^ (self findContextSuchThat: [ :ctx | 
@@ -9,7 +9,7 @@ Context >> findFailedAssertionContextInSenderChain [
 		  StDebuggeAssertionFailureContextNotFound new signal ]
 ]
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 Context >> findFailedAssertionResultsInSenderChain [
 	|assertionContext assertionResult|
 	assertionContext := self findFailedAssertionContextInSenderChain.
diff --git a/src/NewTools-Debugger/DebugSession.extension.st b/src/NewTools-Debugger/DebugSession.extension.st
index bab1242ad..12079682c 100644
--- a/src/NewTools-Debugger/DebugSession.extension.st
+++ b/src/NewTools-Debugger/DebugSession.extension.st
@@ -1,16 +1,16 @@
-Extension { #name : #DebugSession }
+Extension { #name : 'DebugSession' }
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 DebugSession >> application [
 
 	^ nil
 ]
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 DebugSession >> application: anApplication [
 ]
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 DebugSession >> spanNewSession [
 
 	^ (self class 
diff --git a/src/NewTools-Debugger/Object.extension.st b/src/NewTools-Debugger/Object.extension.st
index 71a4f2392..054a05e6c 100644
--- a/src/NewTools-Debugger/Object.extension.st
+++ b/src/NewTools-Debugger/Object.extension.st
@@ -1,12 +1,12 @@
-Extension { #name : #Object }
+Extension { #name : 'Object' }
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 Object >> presentDiffIn: aStFailingAssertionPresenter [
 
 	aStFailingAssertionPresenter initializeObjectDiffPresenters
 ]
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 Object >> presentDiffWith: anObject in: aStFailingAssertionPresenter [
 
 	aStFailingAssertionPresenter initializeObjectDiffPresenters
diff --git a/src/NewTools-Debugger/SpCodePresenter.extension.st b/src/NewTools-Debugger/SpCodePresenter.extension.st
index 999e35594..7268c4f28 100644
--- a/src/NewTools-Debugger/SpCodePresenter.extension.st
+++ b/src/NewTools-Debugger/SpCodePresenter.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #SpCodePresenter }
+Extension { #name : 'SpCodePresenter' }
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 SpCodePresenter >> beForContext: aContext [
 	self interactionModel: (StDebuggerContextInteractionModel on: aContext)
 ]
diff --git a/src/NewTools-Debugger/StDebuggeAssertionFailureContextNotFound.class.st b/src/NewTools-Debugger/StDebuggeAssertionFailureContextNotFound.class.st
index 9513d79de..abfa6e7b6 100644
--- a/src/NewTools-Debugger/StDebuggeAssertionFailureContextNotFound.class.st
+++ b/src/NewTools-Debugger/StDebuggeAssertionFailureContextNotFound.class.st
@@ -2,7 +2,9 @@
 I am raised when a context cannot find in its sender chain an assertion failure context, that is, a context that compared two value, an actual and an expected.
 "
 Class {
-	#name : #StDebuggeAssertionFailureContextNotFound,
-	#superclass : #Exception,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggeAssertionFailureContextNotFound',
+	#superclass : 'Exception',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
diff --git a/src/NewTools-Debugger/StDebugger.class.st b/src/NewTools-Debugger/StDebugger.class.st
index 9c42851f0..bcc9fe479 100644
--- a/src/NewTools-Debugger/StDebugger.class.st
+++ b/src/NewTools-Debugger/StDebugger.class.st
@@ -70,8 +70,8 @@ The meta inspection shows methods of the receiver's class hierarchy.
 Methods can be modified and saved in directly in that pane.
 "
 Class {
-	#name : #StDebugger,
-	#superclass : #StPresenter,
+	#name : 'StDebugger',
+	#superclass : 'StPresenter',
 	#traits : 'TDebugger',
 	#classTraits : 'TDebugger classTrait',
 	#instVars : [
@@ -94,17 +94,19 @@ Class {
 		'ErrorRecursion',
 		'FastTDD'
 	],
-	#category : #'NewTools-Debugger-View'
+	#category : 'NewTools-Debugger-View',
+	#package : 'NewTools-Debugger',
+	#tag : 'View'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebugger class >> activatedDebuggerExtensions [
 
 	^ self extensionToolsClasses select: [ :extension |
 		  extension showInDebugger ]
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebugger class >> buildCommandsGroupWith: stDebuggerInstance forRoot: rootCommandGroup [
 
 	StDebuggerStackCommandTreeBuilder
@@ -121,13 +123,13 @@ StDebugger class >> buildCommandsGroupWith: stDebuggerInstance forRoot: rootComm
 		forRoot: rootCommandGroup
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 StDebugger class >> closeAllDebuggers [
 	<script>
 	StDebugger allInstancesDo: [ :dbg | dbg close ]
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebugger class >> debugSession: aDebugSession [
 
 	| debugger debugActionModel |
@@ -140,48 +142,48 @@ StDebugger class >> debugSession: aDebugSession [
 	^ debugger
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebugger class >> debuggerContextClass [
 	^ StDebuggerContext
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebugger class >> defaultDebuggerRank [
 
 	^ 10
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebugger class >> enableStackColoring [
 
 	^ EnableStackColoring
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebugger class >> enableStackColoring: anObject [
 
 	EnableStackColoring := anObject
 ]
 
-{ #category : #'tools registry' }
+{ #category : 'tools registry' }
 StDebugger class >> extensionToolsClasses [
 
 	^ TStDebuggerExtension users reject: [ :extensionClass |
 		  extensionClass isOnlyForTests ]
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StDebugger class >> fastTDD [
 	^FastTDD ifNil:[FastTDD := false]
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StDebugger class >> fastTDD: aBoolean [
 
 	FastTDD := aBoolean
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StDebugger class >> fastTDDSettingsOn: aBuilder [
 	<systemsettings>
 	(aBuilder setting: #fastTDD)
@@ -193,27 +195,27 @@ StDebugger class >> fastTDDSettingsOn: aBuilder [
 without requesting information from the user'
 ]
 
-{ #category : #'tools registry' }
+{ #category : 'tools registry' }
 StDebugger class >> hasAnyActivatedExtension: extensionsClasses [
 
 	^ extensionsClasses anySatisfy: [ :toolClass | 
 		  toolClass showInDebugger ]
 ]
 
-{ #category : #'class initialization' }
+{ #category : 'class initialization' }
 StDebugger class >> initialize [ 
 	self flag: 'Error recursion is used only here?'.
 	ErrorRecursion := false.
 	EnableStackColoring := true
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 StDebugger class >> openOn: aDebugSession withFullView: aBool [
 	
 	^ self openOn: aDebugSession withFullView: aBool andNotification: nil
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 StDebugger class >> openOn: aDebugSession withFullView: aBool andNotification: aString [
 	| debugger |
 	debugger := self on: aDebugSession.
@@ -221,19 +223,19 @@ StDebugger class >> openOn: aDebugSession withFullView: aBool andNotification: a
 	^ debugger
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebugger class >> sessionClass [
 	self flag: 'Should be replaced by Sindarin - should even be removed in that case!'.
 	^ DebugSession
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebugger class >> spanNewSessionFrom: anotherSession [
 	self flag: 'Where is that used? 2019-06-28'.
 	^ anotherSession spanNewSession
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StDebugger class >> stackColoringSettingOn: aBuilder [
 
 	<systemsettings>
@@ -246,25 +248,25 @@ StDebugger class >> stackColoringSettingOn: aBuilder [
 					'If enable, the debugger will highlight the elements of the stacks that are from the same class and same package as the selected context.'.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebugger class >> taskbarIconName [
 
 	^#smallDebug
 ]
 
-{ #category : #'updating - widgets' }
+{ #category : 'updating - widgets' }
 StDebugger class >> updateBlockFor: aDebugger [
 
 	^ [ aDebugger updateStep ]
 ]
 
-{ #category : #'tools registry' }
+{ #category : 'tools registry' }
 StDebugger class >> usesExtensions [
 
 	^ self hasAnyActivatedExtension: self extensionToolsClasses
 ]
 
-{ #category : #'presenter - code' }
+{ #category : 'code pane' }
 StDebugger >> acceptCodeChanges: newSource forContext: aContext [
 
 	"It is wrong here that I have to use code adapter widget.
@@ -278,7 +280,7 @@ StDebugger >> acceptCodeChanges: newSource forContext: aContext [
 	self clearUnsavedCodeChanges
 ]
 
-{ #category : #'commands - support' }
+{ #category : 'commands - support' }
 StDebugger >> buildContextMenus [
 	| stackGroup codeCommands debuggerCommandGroup |
 	
@@ -302,40 +304,40 @@ StDebugger >> buildContextMenus [
 	stackHeader toolbarActions: (debuggerCommandGroup / StDebuggerConfigurationCommandTreeBuilder groupName).
 ]
 
-{ #category : #'commands - support' }
+{ #category : 'commands - support' }
 StDebugger >> canExecuteCreateMissingClassCommand [
 	^ self debuggerActionModel isInterruptedContextMissingClassException
 ]
 
-{ #category : #'commands - support' }
+{ #category : 'commands - support' }
 StDebugger >> canExecuteCreateMissingMethodCommand [
 	^ self debuggerActionModel isInterruptedContextDoesNotUnderstand
 ]
 
-{ #category : #'commands - support' }
+{ #category : 'commands - support' }
 StDebugger >> canExecuteCreateSubclassResponsibilityCommand [
 	^ self debuggerActionModel isInterruptedContextSubclassResponsibilityException
 ]
 
-{ #category : #'commands - support' }
+{ #category : 'commands - support' }
 StDebugger >> canExecuteDebugCommand [
 	^ self debuggerActionModel isContextSteppable
 ]
 
-{ #category : #'commands - support' }
+{ #category : 'commands - support' }
 StDebugger >> canExecuteRestartCommand [
 
 	^ (self debuggerActionModel isInterruptedContextPostMortem or: [ 
 		   self debuggerActionModel isInterruptedContextDead ]) not
 ]
 
-{ #category : #'commands - support' }
+{ #category : 'commands - support' }
 StDebugger >> canExecuteReturnCommand [
 
 	^ self debuggerActionModel isInterruptedContextDead not
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> clear [
 
 	extensionToolsNotebook pages do: [ :page |
@@ -351,7 +353,7 @@ StDebugger >> clear [
 	self clearDebugSession
 ]
 
-{ #category : #'updating - widgets' }
+{ #category : 'code pane' }
 StDebugger >> clearCode [
 	
 	self code
@@ -360,26 +362,26 @@ StDebugger >> clearCode [
 		clearContent
 ]
 
-{ #category : #action }
+{ #category : 'actions' }
 StDebugger >> clearDebugSession [
 
 	self debuggerActionModel ifNotNil: [ :debugActionModel |
 		debugActionModel clearDebugSession ]
 ]
 
-{ #category : #action }
+{ #category : 'actions' }
 StDebugger >> clearDebuggerActionModel [
 	
 	self debuggerActionModel ifNotNil: [ :debugActionModel | debugActionModel clear ]
 ]
 
-{ #category : #'presenter - code' }
+{ #category : 'code pane' }
 StDebugger >> clearUnsavedCodeChanges [
 
 	unsavedCodeChanges := IdentityDictionary new
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 StDebugger >> close [
 
 	programmaticallyClosed := true.
@@ -388,13 +390,13 @@ StDebugger >> close [
 			actionModel clearDebugSession ] ]
 ]
 
-{ #category : #'accessing - widgets' }
+{ #category : 'accessing - presenters' }
 StDebugger >> code [
 
 	^ code
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StDebugger >> codeLayout [
 
 	^ SpBoxLayout newTopToBottom
@@ -403,7 +405,7 @@ StDebugger >> codeLayout [
 		  yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebugger >> connectPresenters [
 
 	super connectPresenters.
@@ -412,18 +414,18 @@ StDebugger >> connectPresenters [
 		self updateCodeFromContext ]
 ]
 
-{ #category : #'accessing - context' }
+{ #category : 'accessing - model' }
 StDebugger >> context [
  
 	^ self interruptedContext
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> copyStackToClipboard [
 	self debuggerActionModel copyStackToClipboard
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> createMissingClass [
 
 	| variableNode |
@@ -441,7 +443,7 @@ StDebugger >> createMissingClass [
 		self interruptedContext sender
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> createMissingMethod [
 
 	| msg chosenClass |
@@ -457,7 +459,7 @@ StDebugger >> createMissingMethod [
 	code takeKeyboardFocus 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> createMissingMethodFor: aMessage in: aClass [
 
 	| method |
@@ -465,10 +467,10 @@ StDebugger >> createMissingMethodFor: aMessage in: aClass [
 	method := self debuggerActionModel implement: aMessage inClass: aClass forContext: self interruptedContext.
 	method isClassified ifFalse: [ method protocol: (self requestProtocolIn: aClass) ].
 
-	self selectTopContext
+	stackTable selectIndex: 1
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> createSubclassResponsibility [
 
 	| senderContext msg chosenClass |
@@ -484,7 +486,7 @@ StDebugger >> createSubclassResponsibility [
 		forContext: senderContext
 ]
 
-{ #category : #'accessing - context' }
+{ #category : 'accessing - model' }
 StDebugger >> currentContext [
 	"I answer the context on which an action should be executed.
 	This is either the selected context or if nothing is selected the interrupted context."
@@ -494,29 +496,29 @@ StDebugger >> currentContext [
 		  ifNotNil: [ self selectedContext ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing - model' }
 StDebugger >> debuggerActionModel [
 	^ debuggerActionModel
 ]
 
-{ #category : #subscription }
+{ #category : 'subscription' }
 StDebugger >> debuggerActionModelCleared [
 
 	self unsubscribeFromActionModel.
 	self unsubscribeFromSystemAnnouncer
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing - model' }
 StDebugger >> debuggerInspectorClass [
 	^ StDebuggerInspector
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing - model' }
 StDebugger >> debuggerInspectorModelClass [
 	^ StDebuggerInspectorModel
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StDebugger >> defaultLayout [
 	^ SpPanedLayout newTopToBottom
 		positionOfSlider: 65 percent;
@@ -525,7 +527,7 @@ StDebugger >> defaultLayout [
 		yourself
 ]
 
-{ #category : #'presenter - code' }
+{ #category : 'code pane' }
 StDebugger >> discardCodeChangesFor: aContext [
 
 	self unsavedCodeChanges removeKey: aContext ifAbsent: [  ].
@@ -533,14 +535,14 @@ StDebugger >> discardCodeChangesFor: aContext [
 	self update
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebugger >> doBrowseClass [
 
 	self systemNavigation browse:
 		(self stackSelectionMethodContext value: self)
 ]
 
-{ #category : #'presenter - code' }
+{ #category : 'code pane' }
 StDebugger >> doBrowseClassReferences [
 
 	| cls |
@@ -550,21 +552,21 @@ StDebugger >> doBrowseClassReferences [
 		ifFalse: [ self systemNavigation browseAllCallsOnClass: cls ]
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebugger >> doBrowseHierarchy [
 
 	self systemNavigation browseHierarchy:
 		(self stackSelectionReceiverClassContext value: self)
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebugger >> doBrowseImplementors [
 
 	self systemNavigation browseAllImplementorsOf:
 		(self stackSelectionMethodSelectorContext value: self)
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebugger >> doBrowseMethodInheritance [
 
 	| cls |
@@ -579,14 +581,14 @@ StDebugger >> doBrowseMethodInheritance [
 		selector: (self stackSelectionMethodSelectorContext value: self)
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebugger >> doBrowseMethodReferences [
 
 	self systemNavigation browseAllSendersOrUsersOf:
 		(self stackSelectionMethodSelectorContext value: self)
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebugger >> doBrowseMethodVersions [
 
 	| target |
@@ -597,32 +599,26 @@ StDebugger >> doBrowseMethodVersions [
 		selector: target selector
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebugger >> doBrowseReceiverClass [
 
 	self systemNavigation browse:
 		(self stackSelectionReceiverClassContext value: self)
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebugger >> doBrowseSenders [
 
 	self systemNavigation browseAllSendersOf:
 		(self stackSelectionMethodSelectorContext value: self)
 ]
 
-{ #category : #accessing }
-StDebugger >> environment [
-
-^ self class environment
-]
-
-{ #category : #'stack - helpers' }
+{ #category : 'accessing - model' }
 StDebugger >> exception [
 	^ self debuggerActionModel exception
 ]
 
-{ #category : #stack }
+{ #category : 'stack' }
 StDebugger >> expandStackIfLastItemIsSelected [
 	| selection |
 	selection := stackTable selection.
@@ -632,13 +628,13 @@ StDebugger >> expandStackIfLastItemIsSelected [
 	stackTable selectIndex: selection selectedIndex
 ]
 
-{ #category : #'accessing - widgets' }
+{ #category : 'accessing - presenters' }
 StDebugger >> extensionToolNotebook [
 
 	^ extensionToolsNotebook
 ]
 
-{ #category : #extensions }
+{ #category : 'extensions' }
 StDebugger >> extensionToolUpdateBlock [
 
 	^ [ :newPages |
@@ -647,23 +643,23 @@ StDebugger >> extensionToolUpdateBlock [
 		  <= s2 presenterProvider value displayOrder ] ]
 ]
 
-{ #category : #extensions }
+{ #category : 'extensions' }
 StDebugger >> extensionTools [
 	^ extensionTools ifNil: [ extensionTools := OrderedCollection new ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> fileOutSelectedContext [
 	self debuggerActionModel
 		fileOutMethod: stackTable selection selectedItem method
 ]
 
-{ #category : #stack }
+{ #category : 'stack' }
 StDebugger >> filterStack: aStack [
 	^self debuggerActionModel filterStack: aStack
 ]
 
-{ #category : #stack }
+{ #category : 'stack' }
 StDebugger >> findFirstRelevantStackIndexIn: aStack [
 	| counter |
 	counter := 1.
@@ -673,7 +669,7 @@ StDebugger >> findFirstRelevantStackIndexIn: aStack [
 	^ 1
 ]
 
-{ #category : #'updating - session' }
+{ #category : 'updating' }
 StDebugger >> forceSessionUpdate [
 
 	self
@@ -681,7 +677,7 @@ StDebugger >> forceSessionUpdate [
 		updateExtensionsFrom: self session
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StDebugger >> initialExtent [ 
 	
 	^ [ | w h |
@@ -692,7 +688,7 @@ StDebugger >> initialExtent [
 		do: [ 850@650 ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebugger >> initialize [
 
 	super initialize.
@@ -703,14 +699,14 @@ StDebugger >> initialize [
 	programmaticallyClosed := false.
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebugger >> initializeBreakpointInspector [
 	breakpointInspector := self
 		instantiate: StDebuggerBreakpointInspection
 		on: (StInspectorModel on: nil).
 ]
 
-{ #category : #'presenter - code' }
+{ #category : 'code pane' }
 StDebugger >> initializeCode [
 
 	code := self newCode.
@@ -719,7 +715,7 @@ StDebugger >> initializeCode [
 	code whenResetDo: [ self discardCodeChangesFor: self selectedContext ]
 ]
 
-{ #category : #extensions }
+{ #category : 'extensions' }
 StDebugger >> initializeExtensionTools [
 
 	| sortedToolClasses pages |
@@ -739,7 +735,7 @@ StDebugger >> initializeExtensionTools [
 	extensionToolsNotebook pages: pages
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebugger >> initializeInspector [
 
 	inspector := self
@@ -748,7 +744,7 @@ StDebugger >> initializeInspector [
 	inspector label: 'Receiver'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebugger >> initializePresenters [
 
 	self initializeStack.
@@ -761,7 +757,7 @@ StDebugger >> initializePresenters [
 	self layout: self defaultLayout
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebugger >> initializeShortcuts: aWindowPresenter [
 
 	self flag: #DBG_TempSolvesSpecBug_RemoveWhenFixed.
@@ -785,7 +781,7 @@ StDebugger >> initializeShortcuts: aWindowPresenter [
 		toAction: [ self restartCurrentContext ]
 ]
 
-{ #category : #initialization }
+{ #category : 'stack' }
 StDebugger >> initializeStack [
 
 	stackTable := self newTable.
@@ -830,7 +826,7 @@ StDebugger >> initializeStack [
 	stackHeader label: 'Stack'
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebugger >> initializeToolbar [
 
 	toolbar := self newToolbar.
@@ -838,7 +834,7 @@ StDebugger >> initializeToolbar [
 	toolbar displayMode: self application toolbarDisplayMode
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebugger >> initializeWindow: aWindowPresenter [
 
 	super initializeWindow: aWindowPresenter.
@@ -850,7 +846,7 @@ StDebugger >> initializeWindow: aWindowPresenter [
 	self initializeShortcuts: aWindowPresenter
 ]
 
-{ #category : #extensions }
+{ #category : 'extensions' }
 StDebugger >> instantiateExtensionToolsPage: aToolClass [
 	| toolInstance |
 	toolInstance := self instantiate: aToolClass on: self.
@@ -861,33 +857,36 @@ StDebugger >> instantiateExtensionToolsPage: aToolClass [
 		provider: [ toolInstance ]
 ]
 
-{ #category : #'accessing - context' }
+{ #category : 'accessing - model' }
 StDebugger >> interruptedContext [
 
 	^ self debuggerActionModel interruptedContext
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing - model' }
 StDebugger >> interruptedProcess [
 
 	^ self debuggerActionModel  interruptedProcess
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StDebugger >> isInSelectedContextClass: context [
 	"Return true if the given context is in the same class than the currently selected context of the stack."
 
-	^ self selectedContext methodClass = context methodClass
+	| selectedContext |
+	selectedContext := self selectedContext.
+	^ selectedContext notNil and: [
+		  selectedContext methodClass = context methodClass ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StDebugger >> isInSelectedContextPackage: context [
 	"Return true if the given context is in the same package than the currently selected context of the stack."
 
 	^ self selectedContext method package = context method package
 ]
 
-{ #category : #'commands - support' }
+{ #category : 'commands - support' }
 StDebugger >> keybindsForFromContextMenu: aGroupElement [
 	| keybinds keybindsCommands |
 	keybinds := KMCategory new.
@@ -904,7 +903,7 @@ StDebugger >> keybindsForFromContextMenu: aGroupElement [
 	^ keybinds
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebugger >> newDebuggerContext [
 
 	^ self class debuggerContextClass new
@@ -913,7 +912,7 @@ StDebugger >> newDebuggerContext [
 		  yourself
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebugger >> newDebuggerContextFor: aContext [
 
 	^ self newDebuggerContext
@@ -922,22 +921,22 @@ StDebugger >> newDebuggerContextFor: aContext [
 		  yourself
 ]
 
-{ #category : #'accessing - context' }
+{ #category : 'accessing - model' }
 StDebugger >> newTitle [
 
 	^ self debuggerActionModel statusStringForContext
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StDebugger >> okToChange [
 
-	self code canDiscardEdits
-		ifTrue: [ ^ true ].
+	self flag: 'Seems to be used to control if we can close the debugger when we edited code. This should be investigated'.
+	self code canDiscardEdits ifTrue: [ ^ true ].
 	self code changed: #wantToChange.
 	^ self code canDiscardEdits
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 StDebugger >> openWithFullView [
 
 	"Create and schedule a full debugger with the given label. Do not
@@ -946,13 +945,13 @@ StDebugger >> openWithFullView [
 	self open
 ]
 
-{ #category : #opening }
+{ #category : 'opening' }
 StDebugger >> openWithNotification: notificationString [
 
 	self openWithFullView
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> peelToFirstLike: aContext [
 
 	self debuggerActionModel peelToFirstLike: aContext.
@@ -960,7 +959,7 @@ StDebugger >> peelToFirstLike: aContext [
 	self code text: self currentContext sourceCode
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StDebugger >> printReceiverClassInContext: aContext [
 
 	| receiverClass methodClass |
@@ -976,7 +975,7 @@ StDebugger >> printReceiverClassInContext: aContext [
 		  contents
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> proceedDebugSession [
 
 	self unsubscribeFromActionModel .
@@ -984,7 +983,7 @@ StDebugger >> proceedDebugSession [
 	self close
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StDebugger >> protocolSuggestionsFor: aClass [
 
 	| classProtocols reject allExistingProtocols interestingProtocols |
@@ -995,13 +994,13 @@ StDebugger >> protocolSuggestionsFor: aClass [
 	^ interestingProtocols reject: [ :e | reject includes: e ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> recompileMethodTo: aString inContext: aContext notifying: aNotifyer [
 
 	^ self debuggerActionModel recompileMethodTo: aString inContext: aContext notifying: aNotifyer.
 ]
 
-{ #category : #'presenter - code' }
+{ #category : 'code pane' }
 StDebugger >> recordUnsavedCodeChanges [
 
 	|codeInteractionModel codeText|
@@ -1012,12 +1011,12 @@ StDebugger >> recordUnsavedCodeChanges [
 	self unsavedCodeChanges at: codeInteractionModel context put: codeText
 ]
 
-{ #category : #extensions }
+{ #category : 'extensions' }
 StDebugger >> registerExtensionTool: anExtension [
 	self extensionTools add: anExtension
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StDebugger >> requestClassFrom: aClass [
 
 	^ self requestClassFrom: aClass to: ProtoObject
@@ -1025,7 +1024,7 @@ StDebugger >> requestClassFrom: aClass [
 	
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StDebugger >> requestClassFrom: aClass to: aSuperclass [
 
 	self class fastTDD ifTrue: [ ^ aClass ].
@@ -1034,7 +1033,7 @@ StDebugger >> requestClassFrom: aClass to: aSuperclass [
 	
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StDebugger >> requestProtocolIn: aClass [
 
 	| entryCompletion applicants choice |
@@ -1057,7 +1056,7 @@ StDebugger >> requestProtocolIn: aClass [
 	^ choice ifEmpty: [ Protocol unclassified ]
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StDebugger >> requestSuperclassOf: aClass to: aSuperclass [
 
 	| classes |
@@ -1073,7 +1072,7 @@ StDebugger >> requestSuperclassOf: aClass to: aSuperclass [
 		   openModal) ifNil: [ Abort signal ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> restartCurrentContext [
 
 	self debuggerActionModel restartContext: self currentContext.
@@ -1082,7 +1081,7 @@ StDebugger >> restartCurrentContext [
 	self updateCodeFromContext
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> returnEnteredValue [
 	| expression |
 	self flag: #DBG_HowToTestNilIfUserCancels.
@@ -1095,14 +1094,14 @@ StDebugger >> returnEnteredValue [
 		fromContext: self currentContext
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> runToSelection [
 	self debuggerActionModel
 		runToSelection: self code selectionInterval
 		inContext: self currentContext
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> selectNextExecutedExpression [
 
 	| sourceNodeExecuted |
@@ -1111,29 +1110,24 @@ StDebugger >> selectNextExecutedExpression [
 		(sourceNodeExecuted start to: sourceNodeExecuted stop)
 ]
 
-{ #category : #stack }
-StDebugger >> selectTopContext [
-	stackTable selectIndex: 1
-]
-
-{ #category : #'updating - actions' }
+{ #category : 'code pane' }
 StDebugger >> selectedCodeRangeForContext: aContext [
 
 	^ self debuggerActionModel selectedCodeRangeForContext: aContext
 ]
 
-{ #category : #'accessing - context' }
+{ #category : 'accessing - model' }
 StDebugger >> selectedContext [
 
 	^ self stackTable selection selectedItem
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing - model' }
 StDebugger >> session [
 	^ self debuggerActionModel session
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing - model' }
 StDebugger >> session: aSession [
 
 	debuggerActionModel
@@ -1143,13 +1137,13 @@ StDebugger >> session: aSession [
 		ifNotNil: [ debuggerActionModel session: aSession ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebugger >> setModelBeforeInitialization: aSession [
 
 	self session: aSession
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebugger >> setStackAndCodeContainer [
 
 	stackAndCodeContainer := self class usesExtensions
@@ -1158,19 +1152,19 @@ StDebugger >> setStackAndCodeContainer [
 		                         ifFalse: [ self stackAndCodeLayout ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> showFullStack [
 	stackTable items: (self filterStack: self stack)
 
 ]
 
-{ #category : #'accessing - variables' }
+{ #category : 'stack' }
 StDebugger >> stack [
 	^ self debuggerActionModel stack 
 
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StDebugger >> stackAndCodeLayout [
 
 	^ SpPanedLayout newTopToBottom
@@ -1180,7 +1174,7 @@ StDebugger >> stackAndCodeLayout [
 		yourself
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StDebugger >> stackAndCodeWithExtensionsLayout [
 
 	^ (SpPanedLayout newLeftToRight
@@ -1190,7 +1184,7 @@ StDebugger >> stackAndCodeWithExtensionsLayout [
 			yourself)
 ]
 
-{ #category : #accessing }
+{ #category : 'stack' }
 StDebugger >> stackColorForContext: context [
 	"I return the color the text should have in the stack by comparing the context in parameter to the selected context.
 	
@@ -1199,23 +1193,27 @@ StDebugger >> stackColorForContext: context [
 	Else, we just keep the normal style."
 
 	self class enableStackColoring ifFalse: [ ^ self theme textColor ].
+	self selectedContext ifNil: [ ^ self theme textColor ].
 
 	^ (self isInSelectedContextClass: context)
 		  ifTrue: [ self theme highlightTextColor ]
 		  ifFalse: [
 			  (self isInSelectedContextPackage: context)
-				  ifTrue: [ self theme highlightTextColor mixed: 0.5 with: self theme textColor ]
+				  ifTrue: [
+				  self theme highlightTextColor
+					  mixed: 0.5
+					  with: self theme textColor ]
 				  ifFalse: [ self theme textColor ] ]
 ]
 
-{ #category : #stack }
+{ #category : 'stack' }
 StDebugger >> stackIconForContext: context [
 
 	self unsavedCodeChanges at: context ifAbsent: [ ^ nil ].
 	^ self iconNamed: #overlayDirty
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StDebugger >> stackLayout [
 	^ SpBoxLayout newTopToBottom
 		add: #stackHeader
@@ -1226,58 +1224,58 @@ StDebugger >> stackLayout [
 		yourself
 ]
 
-{ #category : #'stack - helpers' }
+{ #category : 'stack' }
 StDebugger >> stackOfSize: anInteger [
 
 	^ self debuggerActionModel stackOfSize: anInteger
 ]
 
-{ #category : #'commands - support' }
+{ #category : 'commands - support' }
 StDebugger >> stackSelectionMethodContext [
 
 	^ [ :dbg | stackTable selection selectedItem homeMethod ]
 ]
 
-{ #category : #'commands - support' }
+{ #category : 'commands - support' }
 StDebugger >> stackSelectionMethodSelectorContext [
 
 	^ [ :dbg | stackTable selection selectedItem method selector ]
 ]
 
-{ #category : #'commands - support' }
+{ #category : 'commands - support' }
 StDebugger >> stackSelectionReceiverClassContext [
 
 	^ [ :dbg | stackTable selection selectedItem receiver class ]
 ]
 
-{ #category : #'commands - support' }
+{ #category : 'commands - support' }
 StDebugger >> stackSelectionReceiverContext [
 
 	^ [ :dbg | stackTable selection selectedItem receiver ]
 ]
 
-{ #category : #'accessing - widgets' }
+{ #category : 'accessing - presenters' }
 StDebugger >> stackTable [
 
 	^ stackTable
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> stepInto [
 	self debuggerActionModel stepInto: self currentContext
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> stepOver [
 	self debuggerActionModel stepOver: self currentContext
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebugger >> stepThrough [
 	self debuggerActionModel stepThrough: self currentContext
 ]
 
-{ #category : #subscription }
+{ #category : 'subscription' }
 StDebugger >> subscribeToActionModel [
 
 	self debuggerActionModel
@@ -1287,9 +1285,6 @@ StDebugger >> subscribeToActionModel [
 		when: StDebuggerActionModelRestartAnnouncement
 		send: #updateRestart
 		to: self;
-		when: StDebuggerActionModelResumeAnnouncement
-		send: #updateResume
-		to: self;
 		when: StDebuggerActionModelContextChangedAnnouncement
 		send: #updateContextChanged
 		to: self;
@@ -1301,7 +1296,7 @@ StDebugger >> subscribeToActionModel [
 		to: self
 ]
 
-{ #category : #'system subscriptions' }
+{ #category : 'subscription' }
 StDebugger >> susbcribeToExtensionToggleAnnouncement [
 
 	SystemAnnouncer uniqueInstance weak
@@ -1310,50 +1305,50 @@ StDebugger >> susbcribeToExtensionToggleAnnouncement [
 		to: self
 ]
 
-{ #category : #'accessing - widgets' }
+{ #category : 'accessing - presenters' }
 StDebugger >> toolbar [
 
 	^ toolbar
 ]
 
-{ #category : #'presenter - code' }
+{ #category : 'code pane' }
 StDebugger >> unsavedCodeChanges [
 
 	^ unsavedCodeChanges ifNil: [ 
 		  unsavedCodeChanges := IdentityDictionary new ]
 ]
 
-{ #category : #'presenter - code' }
+{ #category : 'code pane' }
 StDebugger >> unsavedCodeChangesFor: aContext [ 
 	^self unsavedCodeChanges at: aContext
 ]
 
-{ #category : #'events - removing' }
+{ #category : 'events - removing' }
 StDebugger >> unsubscribeFromActionModel [
 
 	self debuggerActionModel ifNotNil: [ :actionModel |
 		actionModel unsubscribe: self ]
 ]
 
-{ #category : #'system subscription' }
+{ #category : 'subscription' }
 StDebugger >> unsubscribeFromSystemAnnouncer [
 
 	SystemAnnouncer uniqueInstance unsubscribe: self
 ]
 
-{ #category : #'updating - widgets' }
+{ #category : 'updating' }
 StDebugger >> updateAfterMethodAdded [
 
 	self updateToolbar
 ]
 
-{ #category : #'updating - widgets' }
+{ #category : 'updating - presenters' }
 StDebugger >> updateCodeFromContext [
 
 	self updateCodeFromContext: self currentContext
 ]
 
-{ #category : #'presenter - code' }
+{ #category : 'code pane' }
 StDebugger >> updateCodeFromContext: aContext [
 
 	| selectionInterval formerCodeInteractionModel |
@@ -1376,7 +1371,7 @@ StDebugger >> updateCodeFromContext: aContext [
 		forInterval: selectionInterval
 ]
 
-{ #category : #'updating - widgets' }
+{ #category : 'updating - presenters' }
 StDebugger >> updateCodeTextSegmentDecoratorsIn: aContext forInterval: selectionInterval [
 	
 	self code removeAllTextSegmentDecorations.
@@ -1399,7 +1394,7 @@ StDebugger >> updateCodeTextSegmentDecoratorsIn: aContext forInterval: selection
 		title: 'Click me!';"
 ]
 
-{ #category : #'updating - actions' }
+{ #category : 'updating' }
 StDebugger >> updateContextChanged [
 	"A context has changed when a method has been recompiled. If a method has been recompiled with additional instance variables and/or temporary variables, the inspector needs to be updated"
 
@@ -1409,12 +1404,12 @@ StDebugger >> updateContextChanged [
 	self updateStep
 ]
 
-{ #category : #'updating - widgets' }
+{ #category : 'updating - presenters' }
 StDebugger >> updateExtensionsFrom: newSession [
 	self extensionTools do:[:tool| tool updatePresenter]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebugger >> updateExtensionsFromAnnouncement: aStDebuggerToggleAnnouncement [
 
 	| extensionToggled |
@@ -1450,7 +1445,7 @@ StDebugger >> updateExtensionsFromAnnouncement: aStDebuggerToggleAnnouncement [
 	self layout: self defaultLayout
 ]
 
-{ #category : #'updating - widgets' }
+{ #category : 'updating - presenters' }
 StDebugger >> updateInspectorFromContext: aContext [
 
 	inspector
@@ -1462,31 +1457,20 @@ StDebugger >> updateInspectorFromContext: aContext [
 	inspector getRawInspectorPresenterOrNil ifNotNil: [ :p | p update ]
 ]
 
-{ #category : #'updating - widgets' }
-StDebugger >> updatePredicatesForContext: aContext [
-
-	self debuggerActionModel updateContextPredicate
-]
-
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebugger >> updatePresenter [
 
 	self updateStackFromSession: self session.
 	self buildContextMenus
 ]
 
-{ #category : #'updating - actions' }
+{ #category : 'updating' }
 StDebugger >> updateRestart [
 
 	self updateStep
 ]
 
-{ #category : #'updating - actions' }
-StDebugger >> updateResume [
-
-]
-
-{ #category : #'presenter - code' }
+{ #category : 'code pane' }
 StDebugger >> updateSourceCodeFor: aContext [
 
 	| codeText |
@@ -1496,7 +1480,7 @@ StDebugger >> updateSourceCodeFor: aContext [
 	self code text: codeText
 ]
 
-{ #category : #stack }
+{ #category : 'stack' }
 StDebugger >> updateStackFromSession: aSession [
 	| stack |
 	stack := self filterStack: aSession stack.
@@ -1506,7 +1490,7 @@ StDebugger >> updateStackFromSession: aSession [
 		scrollToSelection: true
 ]
 
-{ #category : #'updating - actions' }
+{ #category : 'updating' }
 StDebugger >> updateStep [
   | previousASTScope previousContext currentASTScope currentContext |
 	
@@ -1528,7 +1512,7 @@ StDebugger >> updateStep [
 		p update ]
 ]
 
-{ #category : #'updating - widgets' }
+{ #category : 'updating - presenters' }
 StDebugger >> updateToolbar [
 	
 	toolbarCommandGroup ifNil: [ ^ self ].
@@ -1536,13 +1520,13 @@ StDebugger >> updateToolbar [
 		spCommand updateEnableStatus ]
 ]
 
-{ #category : #'updating - widgets' }
+{ #category : 'updating - presenters' }
 StDebugger >> updateWindowTitle [
 
 	self withWindowDo: [ :window | window title: self newTitle ].
 ]
 
-{ #category : #'ui requests' }
+{ #category : 'ui requests' }
 StDebugger >> warning: aString for: aPresenter [
 
 	self newPopover
diff --git a/src/NewTools-Debugger/StDebuggerActionModel.class.st b/src/NewTools-Debugger/StDebuggerActionModel.class.st
index 3d854fa78..5b500268e 100644
--- a/src/NewTools-Debugger/StDebuggerActionModel.class.st
+++ b/src/NewTools-Debugger/StDebuggerActionModel.class.st
@@ -2,8 +2,8 @@
 I implement debug actions exposed by debuggers, and performed on the current debug session.
 "
 Class {
-	#name : #StDebuggerActionModel,
-	#superclass : #Object,
+	#name : 'StDebuggerActionModel',
+	#superclass : 'Object',
 	#instVars : [
 		'session',
 		'contextPredicate',
@@ -16,10 +16,12 @@ Class {
 	#classVars : [
 		'ShouldFilterStack'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebuggerActionModel class >> on: aDebugSession [
 
 	^ self basicNew
@@ -27,17 +29,17 @@ StDebuggerActionModel class >> on: aDebugSession [
 		  initialize
 ]
 
-{ #category : #asserting }
+{ #category : 'asserting' }
 StDebuggerActionModel class >> shouldFilterStack [
 	^ShouldFilterStack ifNil:[ShouldFilterStack := true]
 ]
 
-{ #category : #asserting }
+{ #category : 'asserting' }
 StDebuggerActionModel class >> shouldFilterStack: aBoolean [
 	ShouldFilterStack := aBoolean
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StDebuggerActionModel class >> shouldFilterStackSettingsOn: aBuilder [
 	<systemsettings>
 	(aBuilder setting: #shouldFilterStack)
@@ -48,13 +50,13 @@ StDebuggerActionModel class >> shouldFilterStackSettingsOn: aBuilder [
 		description: 'Defines if methods with pragma #debuggerCompleteToSender are filtered (hidden) in the debugger stack'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModel >> announcer [
 
 	^ announcer ifNil: [ announcer := Announcer new ]
 ]
 
-{ #category : #'debug - session' }
+{ #category : 'debug - session' }
 StDebuggerActionModel >> autoClassifyMessage: aMessage inClass: aClass [
 
 	| method |
@@ -62,7 +64,7 @@ StDebuggerActionModel >> autoClassifyMessage: aMessage inClass: aClass [
 	method isClassified ifFalse: [ MethodClassifier classify: method ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebuggerActionModel >> clear [
 
 	self unsubscribeFromSystemAnnouncer.
@@ -72,7 +74,7 @@ StDebuggerActionModel >> clear [
 	announcer := nil
 ]
 
-{ #category : #'debug - execution' }
+{ #category : 'debug - execution' }
 StDebuggerActionModel >> clearDebugSession [
 
 	contextPredicate := nil.
@@ -81,7 +83,7 @@ StDebuggerActionModel >> clearDebugSession [
 		clear
 ]
 
-{ #category : #context }
+{ #category : 'context' }
 StDebuggerActionModel >> computeInitialTopContext [
 
 	topContext := session exception signalContext.
@@ -92,7 +94,7 @@ StDebuggerActionModel >> computeInitialTopContext [
 		topContext := self interruptedContext ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModel >> contextPredicate [
 
 	^ contextPredicate ifNil: [ 
@@ -100,7 +102,7 @@ StDebuggerActionModel >> contextPredicate [
 			                      self topContext ]
 ]
 
-{ #category : #context }
+{ #category : 'context' }
 StDebuggerActionModel >> contextPredicateFor: aContext [
 
 	| postMortem ex |
@@ -116,7 +118,7 @@ StDebuggerActionModel >> contextPredicateFor: aContext [
 	^ self predicateFor: aContext exception: ex postMortem: postMortem
 ]
 
-{ #category : #'debug - predicates' }
+{ #category : 'debug - predicates' }
 StDebuggerActionModel >> contextSignalsAnException: aContext [
 
 	^ aContext notNil 
@@ -124,7 +126,7 @@ StDebuggerActionModel >> contextSignalsAnException: aContext [
 		and: [  aContext selector = #signal ] ]
 ]
 
-{ #category : #'debug - stack' }
+{ #category : 'debug - stack' }
 StDebuggerActionModel >> copyStackToClipboard [
 	Clipboard
 		clipboardText:
@@ -132,22 +134,22 @@ StDebuggerActionModel >> copyStackToClipboard [
 				streamContents: [ :s | self interruptedContext printDebugStackOn: s ])
 ]
 
-{ #category : #'stack - helpers' }
+{ #category : 'stack - helpers' }
 StDebuggerActionModel >> exception [
 	^ self session exception
 ]
 
-{ #category : #'debug - stack' }
+{ #category : 'debug - stack' }
 StDebuggerActionModel >> fileOutMethod: aMethod [
 	aMethod methodClass fileOutMethod: aMethod selector
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModel >> filterStack [
 	^ filterStack
 ]
 
-{ #category : #'debug - stack' }
+{ #category : 'debug - stack' }
 StDebuggerActionModel >> filterStack: aStack [
 	| context contextsToReject |	
 	self shouldFilterStack ifFalse: [  ^aStack ].
@@ -169,7 +171,7 @@ StDebuggerActionModel >> filterStack: aStack [
 	^ aStack
 ]
 
-{ #category : #'debug - session' }
+{ #category : 'debug - session' }
 StDebuggerActionModel >> implement: aMessage inClass: aClass forContext: aContext [
 
 	| method |
@@ -182,7 +184,7 @@ StDebuggerActionModel >> implement: aMessage inClass: aClass forContext: aContex
 	^ method
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerActionModel >> initialize [
 	super initialize.
 	self computeInitialTopContext.
@@ -192,23 +194,23 @@ StDebuggerActionModel >> initialize [
 	preventUpdate := false
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModel >> interruptedContext [
 	^self session interruptedContext
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModel >> interruptedProcess [
 	^ self session interruptedProcess
 ]
 
-{ #category : #'debug - predicates' }
+{ #category : 'debug - predicates' }
 StDebuggerActionModel >> isContextAnAssertionFailure [
 
 	^ self contextPredicate isContextAnAssertionFailure
 ]
 
-{ #category : #context }
+{ #category : 'context' }
 StDebuggerActionModel >> isContextPostMortem: aContext [
 
 	aContext == topContext ifFalse: [ 
@@ -219,59 +221,59 @@ StDebuggerActionModel >> isContextPostMortem: aContext [
 	^ self session isContextPostMortem: self interruptedContext
 ]
 
-{ #category : #'debug - predicates' }
+{ #category : 'debug - predicates' }
 StDebuggerActionModel >> isContextSteppable [
 
 	self interruptedContext ifNil: [ ^ false ].
 	^ self contextPredicate isSteppable
 ]
 
-{ #category : #'debug - predicates' }
+{ #category : 'debug - predicates' }
 StDebuggerActionModel >> isInterruptedContextAnAssertEqualsFailure [
 
 	^ self contextPredicate isContextAnAssertionFailure
 ]
 
-{ #category : #'debug - predicates' }
+{ #category : 'debug - predicates' }
 StDebuggerActionModel >> isInterruptedContextDead [
 	^ self contextPredicate isContextDead
 ]
 
-{ #category : #'debug - predicates' }
+{ #category : 'debug - predicates' }
 StDebuggerActionModel >> isInterruptedContextDoesNotUnderstand [
 	^self contextPredicate isContextDoesNotUnderstand
 
 ]
 
-{ #category : #'debug - predicates' }
+{ #category : 'debug - predicates' }
 StDebuggerActionModel >> isInterruptedContextMissingClassException [
 
 	^ self contextPredicate isContextMissingClassException
 ]
 
-{ #category : #'debug - predicates' }
+{ #category : 'debug - predicates' }
 StDebuggerActionModel >> isInterruptedContextPostMortem [
 	^ self contextPredicate isContextPostMortem
 ]
 
-{ #category : #'debug - predicates' }
+{ #category : 'debug - predicates' }
 StDebuggerActionModel >> isInterruptedContextSubclassResponsibilityException [
 	^ self contextPredicate isContextSubclassResponsibilityException
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebuggerActionModel >> newStepAnnouncement [
 
 	^ (StDebuggerActionModelStepAnnouncement debuggerActionModel: self)
 ]
 
-{ #category : #'debug - execution' }
+{ #category : 'debug - execution' }
 StDebuggerActionModel >> peelToFirstLike: aContext [
 	self session peelToFirstLike: aContext.
 	self updateTopContext
 ]
 
-{ #category : #context }
+{ #category : 'context' }
 StDebuggerActionModel >> predicateFor: aContext exception: exception postMortem: isContextPostMortem [
 
 	^ (StDebuggerErrorContextPredicate context: aContext)
@@ -280,7 +282,7 @@ StDebuggerActionModel >> predicateFor: aContext exception: exception postMortem:
 		  yourself
 ]
 
-{ #category : #context }
+{ #category : 'context' }
 StDebuggerActionModel >> predicateFor: aContext failure: testFailure postMortem: isContextPostMortem [
 
 	^ (StDebuggerTestFailureContextPredicate context: aContext)
@@ -289,7 +291,7 @@ StDebuggerActionModel >> predicateFor: aContext failure: testFailure postMortem:
 		  yourself
 ]
 
-{ #category : #context }
+{ #category : 'context' }
 StDebuggerActionModel >> predicateFor: aContext postMortem: isContextPostMortem [
 
 	^ (StDebuggerContextPredicate context: aContext)
@@ -297,7 +299,7 @@ StDebuggerActionModel >> predicateFor: aContext postMortem: isContextPostMortem
 		  yourself
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StDebuggerActionModel >> preventUpdatesDuring: aBlock [
 
 	"Sets the prevent update flag during the execution of a block. Restores its value after the block 	finishes"
@@ -310,13 +312,13 @@ StDebuggerActionModel >> preventUpdatesDuring: aBlock [
 	self update ] ensure: [ preventUpdate := oldEventFlag ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModel >> previousASTScope [
 
 	^ previousASTScope
 ]
 
-{ #category : #'debug - execution' }
+{ #category : 'debug - execution' }
 StDebuggerActionModel >> proceedDebugSession [
 
 	contextPredicate := nil.
@@ -325,13 +327,13 @@ StDebuggerActionModel >> proceedDebugSession [
 		clear
 ]
 
-{ #category : #'events-triggering' }
+{ #category : 'events-triggering' }
 StDebuggerActionModel >> raiseUpdateEvents: anAnnouncement [
 
 	self announcer announce: anAnnouncement
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebuggerActionModel >> recompileMethodTo: aString inContext: aContext notifying: aNotifyer [
 
 	| methodContext homePC |
@@ -349,7 +351,7 @@ StDebuggerActionModel >> recompileMethodTo: aString inContext: aContext notifyin
 		                     homePC) scope
 ]
 
-{ #category : #context }
+{ #category : 'context' }
 StDebuggerActionModel >> referenceContext [
 	"The reference context is the context that we wish to see in the debugger's stack.
 	It it either the interrupted context if we are in a non-exception case,
@@ -358,7 +360,7 @@ StDebuggerActionModel >> referenceContext [
 	^topContext receiver signalerContext 
 ]
 
-{ #category : #'events - handling' }
+{ #category : 'events - handling' }
 StDebuggerActionModel >> registerActionsForSession: aSession [
 
 	self flag: 'Rewrite it'.
@@ -373,7 +375,7 @@ StDebuggerActionModel >> registerActionsForSession: aSession [
 			when: #clear send: #clear to: self ]
 ]
 
-{ #category : #'events - removing' }
+{ #category : 'events - removing' }
 StDebuggerActionModel >> removeActionsForSession: aSession [
 	self flag: 'Rewrite it'.
 	aSession
@@ -386,7 +388,7 @@ StDebuggerActionModel >> removeActionsForSession: aSession [
 				removeActionsForEvent: #contextChanged ]
 ]
 
-{ #category : #'debug - execution' }
+{ #category : 'debug - execution' }
 StDebuggerActionModel >> restartContext: aContext [
 
 	previousASTScope := (aContext compiledCode sourceNodeForPC:
@@ -395,7 +397,7 @@ StDebuggerActionModel >> restartContext: aContext [
 	self updateTopContext
 ]
 
-{ #category : #'debug - execution' }
+{ #category : 'debug - execution' }
 StDebuggerActionModel >> returnValueFromExpression: aString fromContext: aContext [
 	| value |
 	value := session class compiler
@@ -406,23 +408,23 @@ StDebuggerActionModel >> returnValueFromExpression: aString fromContext: aContex
 	self updateTopContext
 ]
 
-{ #category : #'debug - execution' }
+{ #category : 'debug - execution' }
 StDebuggerActionModel >> runToSelection: aSelectionInterval inContext: aContext [
 	self session runToSelection: aSelectionInterval inContext: aContext.
 	self updateTopContext
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 StDebuggerActionModel >> selectedCodeRangeForContext: aContext [ 
 	^ self session selectedCodeRangeForContext: aContext
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModel >> session [
 	^session
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModel >> session: aDebugSession [
 	session ifNotNil: [ self removeActionsForSession: session ].
 	session := aDebugSession.
@@ -433,29 +435,29 @@ StDebuggerActionModel >> session: aDebugSession [
 	self updateIfAble
 ]
 
-{ #category : #'debug - stack' }
+{ #category : 'debug - stack' }
 StDebuggerActionModel >> shouldFilterStack [
 
 	^ self filterStack and: [ self class shouldFilterStack ]
 ]
 
-{ #category : #'accessing - variables' }
+{ #category : 'accessing - variables' }
 StDebuggerActionModel >> stack [
 	^ self session stack
 ]
 
-{ #category : #'stack - helpers' }
+{ #category : 'stack - helpers' }
 StDebuggerActionModel >> stackOfSize: anInteger [ 
 	^ self session stackOfSize: anInteger
 ]
 
-{ #category : #context }
+{ #category : 'context' }
 StDebuggerActionModel >> statusStringForContext [
 
 	^ self contextPredicate printDescription
 ]
 
-{ #category : #'debug - stepping' }
+{ #category : 'debug - stepping' }
 StDebuggerActionModel >> stepInto: aContext [
 
 	previousASTScope := aContext sourceNodeExecuted scope.
@@ -466,7 +468,7 @@ StDebuggerActionModel >> stepInto: aContext [
 	self updateTopContext
 ]
 
-{ #category : #'debug - stepping' }
+{ #category : 'debug - stepping' }
 StDebuggerActionModel >> stepOver: aContext [
 
 	previousASTScope := aContext sourceNodeExecuted scope.
@@ -478,7 +480,7 @@ StDebuggerActionModel >> stepOver: aContext [
 	self updateTopContext
 ]
 
-{ #category : #'debug - stepping' }
+{ #category : 'debug - stepping' }
 StDebuggerActionModel >> stepThrough: aContext [
 
 	previousASTScope := aContext sourceNodeExecuted scope.
@@ -486,7 +488,7 @@ StDebuggerActionModel >> stepThrough: aContext [
 	self updateTopContext
 ]
 
-{ #category : #'system subscription' }
+{ #category : 'system subscription' }
 StDebuggerActionModel >> subscribeToMethodAddedAnnouncement [
 
 	SystemAnnouncer uniqueInstance weak
@@ -495,31 +497,31 @@ StDebuggerActionModel >> subscribeToMethodAddedAnnouncement [
 		to: self
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModel >> topContext [
 	^ topContext
 ]
 
-{ #category : #removing }
+{ #category : 'removing' }
 StDebuggerActionModel >> unsubscribe: anEventListener [
 
 	self announcer unsubscribe: anEventListener
 ]
 
-{ #category : #'system subscription' }
+{ #category : 'system subscription' }
 StDebuggerActionModel >> unsubscribeFromSystemAnnouncer [
 
 	SystemAnnouncer uniqueInstance unsubscribe: self
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StDebuggerActionModel >> update [
 
 	self update:
 		(StDebuggerActionModelStepAnnouncement debuggerActionModel: self)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModel >> update: anAnnouncement [
 
 	self updateTopContext.
@@ -529,7 +531,7 @@ StDebuggerActionModel >> update: anAnnouncement [
 	self raiseUpdateEvents: anAnnouncement
 ]
 
-{ #category : #'updating - widgets' }
+{ #category : 'updating - widgets' }
 StDebuggerActionModel >> updateAfterMethodAdded [
 
 	self updateContextPredicate.
@@ -538,7 +540,7 @@ StDebuggerActionModel >> updateAfterMethodAdded [
 			 self)
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebuggerActionModel >> updateContextChanged [
 
 	self updateIfAble:
@@ -546,44 +548,44 @@ StDebuggerActionModel >> updateContextChanged [
 			 debuggerActionModel: self)
 ]
 
-{ #category : #context }
+{ #category : 'context' }
 StDebuggerActionModel >> updateContextPredicate [
 	^self updateContextPredicateFor: self topContext
 ]
 
-{ #category : #context }
+{ #category : 'context' }
 StDebuggerActionModel >> updateContextPredicateFor: aContext [    
 	contextPredicate := self contextPredicateFor: aContext.
 	^contextPredicate
 ]
 
-{ #category : #'debug - session' }
+{ #category : 'debug - session' }
 StDebuggerActionModel >> updateDebugSession [
 	self contextPredicate updateSessionForModel: self 
 		
 ]
 
-{ #category : #'debug - session' }
+{ #category : 'debug - session' }
 StDebuggerActionModel >> updateDebugSessionException: e [
 
 	self session exception: e
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModel >> updateIfAble [
 
 	self updateIfAble:
 		(StDebuggerActionModelStepAnnouncement debuggerActionModel: self)
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModel >> updateIfAble: anAnnouncement [
 
 	preventUpdate ifNil: [ ^ self ].
 	preventUpdate ifFalse: [ self update: anAnnouncement ]
 ]
 
-{ #category : #announcement }
+{ #category : 'announcement' }
 StDebuggerActionModel >> updateRestart [
 
 	self updateIfAble:
@@ -591,27 +593,27 @@ StDebuggerActionModel >> updateRestart [
 			   self)
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebuggerActionModel >> updateResume [
 
 	self updateIfAble:
 		(StDebuggerActionModelResumeAnnouncement debuggerActionModel: self)
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebuggerActionModel >> updateStep [
 
 	self updateIfAble:
 		(StDebuggerActionModelStepAnnouncement debuggerActionModel: self)
 ]
 
-{ #category : #context }
+{ #category : 'context' }
 StDebuggerActionModel >> updateTopContext [
 
 	topContext := self interruptedContext
 ]
 
-{ #category : #announcer }
+{ #category : 'announcer' }
 StDebuggerActionModel >> when: anAnnouncementClass send: aSelector to: anObject [
 
 	self announcer weak
diff --git a/src/NewTools-Debugger/StDebuggerActionModelAnnouncement.class.st b/src/NewTools-Debugger/StDebuggerActionModelAnnouncement.class.st
index 3d29d4a91..a4ef8adfa 100644
--- a/src/NewTools-Debugger/StDebuggerActionModelAnnouncement.class.st
+++ b/src/NewTools-Debugger/StDebuggerActionModelAnnouncement.class.st
@@ -1,25 +1,27 @@
 Class {
-	#name : #StDebuggerActionModelAnnouncement,
-	#superclass : #Announcement,
+	#name : 'StDebuggerActionModelAnnouncement',
+	#superclass : 'Announcement',
 	#instVars : [
 		'debuggerActionModel'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebuggerActionModelAnnouncement class >> debuggerActionModel: aDebuggerActionModel [
 
 	^ self new debuggerActionModel: aDebuggerActionModel
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModelAnnouncement >> debuggerActionModel [
 
 	^ debuggerActionModel
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerActionModelAnnouncement >> debuggerActionModel: aDebuggerActionModel [
 
 	debuggerActionModel := aDebuggerActionModel
diff --git a/src/NewTools-Debugger/StDebuggerActionModelClearAnnouncement.class.st b/src/NewTools-Debugger/StDebuggerActionModelClearAnnouncement.class.st
index 592b111f5..2a652509b 100644
--- a/src/NewTools-Debugger/StDebuggerActionModelClearAnnouncement.class.st
+++ b/src/NewTools-Debugger/StDebuggerActionModelClearAnnouncement.class.st
@@ -1,5 +1,7 @@
 Class {
-	#name : #StDebuggerActionModelClearAnnouncement,
-	#superclass : #StDebuggerActionModelAnnouncement,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerActionModelClearAnnouncement',
+	#superclass : 'StDebuggerActionModelAnnouncement',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
diff --git a/src/NewTools-Debugger/StDebuggerActionModelContextChangedAnnouncement.class.st b/src/NewTools-Debugger/StDebuggerActionModelContextChangedAnnouncement.class.st
index 78df56c81..4d01145ec 100644
--- a/src/NewTools-Debugger/StDebuggerActionModelContextChangedAnnouncement.class.st
+++ b/src/NewTools-Debugger/StDebuggerActionModelContextChangedAnnouncement.class.st
@@ -1,5 +1,7 @@
 Class {
-	#name : #StDebuggerActionModelContextChangedAnnouncement,
-	#superclass : #StDebuggerActionModelAnnouncement,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerActionModelContextChangedAnnouncement',
+	#superclass : 'StDebuggerActionModelAnnouncement',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
diff --git a/src/NewTools-Debugger/StDebuggerActionModelMethodAddedAnnouncement.class.st b/src/NewTools-Debugger/StDebuggerActionModelMethodAddedAnnouncement.class.st
index eee85d40b..aecad00a8 100644
--- a/src/NewTools-Debugger/StDebuggerActionModelMethodAddedAnnouncement.class.st
+++ b/src/NewTools-Debugger/StDebuggerActionModelMethodAddedAnnouncement.class.st
@@ -1,5 +1,7 @@
 Class {
-	#name : #StDebuggerActionModelMethodAddedAnnouncement,
-	#superclass : #StDebuggerActionModelAnnouncement,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerActionModelMethodAddedAnnouncement',
+	#superclass : 'StDebuggerActionModelAnnouncement',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
diff --git a/src/NewTools-Debugger/StDebuggerActionModelRestartAnnouncement.class.st b/src/NewTools-Debugger/StDebuggerActionModelRestartAnnouncement.class.st
index 0a20e231f..8706433a2 100644
--- a/src/NewTools-Debugger/StDebuggerActionModelRestartAnnouncement.class.st
+++ b/src/NewTools-Debugger/StDebuggerActionModelRestartAnnouncement.class.st
@@ -1,5 +1,7 @@
 Class {
-	#name : #StDebuggerActionModelRestartAnnouncement,
-	#superclass : #StDebuggerActionModelAnnouncement,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerActionModelRestartAnnouncement',
+	#superclass : 'StDebuggerActionModelAnnouncement',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
diff --git a/src/NewTools-Debugger/StDebuggerActionModelResumeAnnouncement.class.st b/src/NewTools-Debugger/StDebuggerActionModelResumeAnnouncement.class.st
index fc0b9b588..94b888c92 100644
--- a/src/NewTools-Debugger/StDebuggerActionModelResumeAnnouncement.class.st
+++ b/src/NewTools-Debugger/StDebuggerActionModelResumeAnnouncement.class.st
@@ -1,5 +1,7 @@
 Class {
-	#name : #StDebuggerActionModelResumeAnnouncement,
-	#superclass : #StDebuggerActionModelAnnouncement,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerActionModelResumeAnnouncement',
+	#superclass : 'StDebuggerActionModelAnnouncement',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
diff --git a/src/NewTools-Debugger/StDebuggerActionModelStepAnnouncement.class.st b/src/NewTools-Debugger/StDebuggerActionModelStepAnnouncement.class.st
index cdd2c9237..6f1a8cce5 100644
--- a/src/NewTools-Debugger/StDebuggerActionModelStepAnnouncement.class.st
+++ b/src/NewTools-Debugger/StDebuggerActionModelStepAnnouncement.class.st
@@ -1,5 +1,7 @@
 Class {
-	#name : #StDebuggerActionModelStepAnnouncement,
-	#superclass : #StDebuggerActionModelAnnouncement,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerActionModelStepAnnouncement',
+	#superclass : 'StDebuggerActionModelAnnouncement',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
diff --git a/src/NewTools-Debugger/StDebuggerAssertionFailureResult.class.st b/src/NewTools-Debugger/StDebuggerAssertionFailureResult.class.st
index bd0b526f0..9ba7cab3a 100644
--- a/src/NewTools-Debugger/StDebuggerAssertionFailureResult.class.st
+++ b/src/NewTools-Debugger/StDebuggerAssertionFailureResult.class.st
@@ -5,34 +5,36 @@ I am just a convenience place holder for the results of an assertion failure:
 I am meant to be used when expected and actual results do not satisfy the assertion.
 "
 Class {
-	#name : #StDebuggerAssertionFailureResult,
-	#superclass : #Object,
+	#name : 'StDebuggerAssertionFailureResult',
+	#superclass : 'Object',
 	#instVars : [
 		'actual',
 		'expected'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerAssertionFailureResult >> actual [
 
 	^ actual
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerAssertionFailureResult >> actual: anObject [
 
 	actual := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerAssertionFailureResult >> expected [
 
 	^ expected
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerAssertionFailureResult >> expected: anObject [
 
 	expected := anObject
diff --git a/src/NewTools-Debugger/StDebuggerCodeCommandTreeBuilder.class.st b/src/NewTools-Debugger/StDebuggerCodeCommandTreeBuilder.class.st
index aa12c83cc..b1ddebdea 100644
--- a/src/NewTools-Debugger/StDebuggerCodeCommandTreeBuilder.class.st
+++ b/src/NewTools-Debugger/StDebuggerCodeCommandTreeBuilder.class.st
@@ -8,27 +8,29 @@ As I provide the default debugger commands, you should only extend me by using t
 Using me to add command in the tree makes them default for the debugger code presenter.
 "
 Class {
-	#name : #StDebuggerCodeCommandTreeBuilder,
-	#superclass : #StDebuggerCommandTreeBuilder,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerCodeCommandTreeBuilder',
+	#superclass : 'StDebuggerCommandTreeBuilder',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerCodeCommandTreeBuilder class >> displayStrategy [
 	^CmUIDisplayAsSubMenu 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerCodeCommandTreeBuilder class >> groupDescription [
 	^ 'Debug actions from code'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerCodeCommandTreeBuilder class >> groupName [ 	
 	^'Code'
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerCodeCommandTreeBuilder >> buildDebuggerCommandGroup [
 	| codeGroup |
 	codeGroup := self group.
@@ -36,7 +38,7 @@ StDebuggerCodeCommandTreeBuilder >> buildDebuggerCommandGroup [
 	codeGroup beDisplayedAsGroup
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerCodeCommandTreeBuilder >> codeDebugCommands [
 	| group |
 	group := (CmCommandGroup named: self codeDebugCommandsGroupName)
@@ -51,17 +53,17 @@ StDebuggerCodeCommandTreeBuilder >> codeDebugCommands [
 	^ group
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerCodeCommandTreeBuilder >> codeDebugCommandsDescription [
 	^'Execution control'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerCodeCommandTreeBuilder >> codeDebugCommandsGroupName [
 	^'Execution'
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerCodeCommandTreeBuilder >> codeExecutionControlCommandsClasses [
 	^ {StRunToSelectionCommand}
 ]
diff --git a/src/NewTools-Debugger/StDebuggerCommandTreeBuilder.class.st b/src/NewTools-Debugger/StDebuggerCommandTreeBuilder.class.st
index 7e0fcb5c1..82b536bd6 100644
--- a/src/NewTools-Debugger/StDebuggerCommandTreeBuilder.class.st
+++ b/src/NewTools-Debugger/StDebuggerCommandTreeBuilder.class.st
@@ -11,41 +11,43 @@ For instance:
 - an ""accessing-command classes"" protocol returning arrays of methods (i.e., groups)
 "
 Class {
-	#name : #StDebuggerCommandTreeBuilder,
-	#superclass : #Object,
+	#name : 'StDebuggerCommandTreeBuilder',
+	#superclass : 'Object',
 	#instVars : [
 		'rootCommandGroup',
 		'stDebuggerInstance'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerCommandTreeBuilder class >> buildCommandsGroupWith: aStDebuggerInstance forRoot: aRootCommandGroup [
 	^self new buildCommandsGroupWith: aStDebuggerInstance forRoot: aRootCommandGroup
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerCommandTreeBuilder class >> displayStrategy [
 	^self subclassResponsibility 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerCommandTreeBuilder class >> groupDescription [
 	^self subclassResponsibility 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerCommandTreeBuilder class >> groupName [
 	^self subclassResponsibility 
 ]
 
-{ #category : #converting }
+{ #category : 'converting' }
 StDebuggerCommandTreeBuilder >> asMenuPresenter [ 	
 	^rootCommandGroup asMenuPresenter
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerCommandTreeBuilder >> buildAndRegisterGroup [
 	"builds the group that will register under the provided root command group"
 
@@ -57,41 +59,41 @@ StDebuggerCommandTreeBuilder >> buildAndRegisterGroup [
 	^ group
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerCommandTreeBuilder >> buildCommandsGroupWith: aStDebuggerInstance forRoot: aRootCommandGroup [
 	stDebuggerInstance := aStDebuggerInstance.
 	rootCommandGroup := aRootCommandGroup.
 	self buildDebuggerCommandGroup
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerCommandTreeBuilder >> buildDebuggerCommandGroup [
 	self subclassResponsibility 
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerCommandTreeBuilder >> buildSpecCommand: aCommandClass forContext: anObject [
 	^ aCommandClass forSpecContext: anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerCommandTreeBuilder >> displayStrategy [
 	^self class displayStrategy new
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerCommandTreeBuilder >> group [
 	^ rootCommandGroup
 		commandOrGroupNamed: self groupName
 		ifNone: [ self buildAndRegisterGroup ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerCommandTreeBuilder >> groupDescription [
 	^self class groupDescription
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerCommandTreeBuilder >> groupName [ 
 	^self class groupName
 ]
diff --git a/src/NewTools-Debugger/StDebuggerConfigurationCommandTreeBuilder.class.st b/src/NewTools-Debugger/StDebuggerConfigurationCommandTreeBuilder.class.st
index de549b02b..c91cadfb3 100644
--- a/src/NewTools-Debugger/StDebuggerConfigurationCommandTreeBuilder.class.st
+++ b/src/NewTools-Debugger/StDebuggerConfigurationCommandTreeBuilder.class.st
@@ -8,27 +8,29 @@ As I provide the **default** debugger commands, you should only extend me by usi
 Using me to add command in the tree makes them default for the debugger configuration.
 "
 Class {
-	#name : #StDebuggerConfigurationCommandTreeBuilder,
-	#superclass : #StDebuggerCommandTreeBuilder,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerConfigurationCommandTreeBuilder',
+	#superclass : 'StDebuggerCommandTreeBuilder',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerConfigurationCommandTreeBuilder class >> displayStrategy [
 	^CmUIDisplayAsSubMenu 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerConfigurationCommandTreeBuilder class >> groupDescription [
 	^ 'Debugger configuration actions'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerConfigurationCommandTreeBuilder class >> groupName [ 	
 	^'Debugger configuration'
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerConfigurationCommandTreeBuilder >> buildDebuggerCommandGroup [
 
 	^ self group
@@ -36,7 +38,7 @@ StDebuggerConfigurationCommandTreeBuilder >> buildDebuggerCommandGroup [
 		  yourself
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerConfigurationCommandTreeBuilder >> configurationCommandClasses [
 
 	^ {
@@ -44,7 +46,7 @@ StDebuggerConfigurationCommandTreeBuilder >> configurationCommandClasses [
 		  StDebuggerSettingsCommand }
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerConfigurationCommandTreeBuilder >> generalConfigurationCommandsGroup [
 
 	| group |
@@ -58,13 +60,13 @@ StDebuggerConfigurationCommandTreeBuilder >> generalConfigurationCommandsGroup [
 	^ group
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerConfigurationCommandTreeBuilder >> generalConfigurationGroupDescription [
 
 	^ 'General configuration options for the StDebugger'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerConfigurationCommandTreeBuilder >> generalConfigurationGroupName [
 
 	^ 'General debugger configuration'
diff --git a/src/NewTools-Debugger/StDebuggerContext.class.st b/src/NewTools-Debugger/StDebuggerContext.class.st
index 311f49c4c..af0091db6 100644
--- a/src/NewTools-Debugger/StDebuggerContext.class.st
+++ b/src/NewTools-Debugger/StDebuggerContext.class.st
@@ -3,17 +3,19 @@ I am a simple wrapper holding the current context and the current debug session
 My purpose is only to display context and debug session related information in the debugger inspector.
 "
 Class {
-	#name : #StDebuggerContext,
-	#superclass : #Object,
+	#name : 'StDebuggerContext',
+	#superclass : 'Object',
 	#instVars : [
 		'context',
 		'exception',
 		'debugger'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebuggerContext class >> context: aContext [
 
 	^ self new
@@ -21,7 +23,7 @@ StDebuggerContext class >> context: aContext [
 		  yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContext >> buildExtensionNodes [
 
 	| visitor |
@@ -35,7 +37,7 @@ StDebuggerContext >> buildExtensionNodes [
 		  ifNil: [ #(  ) asOrderedCollection ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContext >> buildInspectorNodes [
 
 	| nodes argsNodes tempsNodes tempsAndArgs |
@@ -56,24 +58,24 @@ StDebuggerContext >> buildInspectorNodes [
 	^ nodes
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContext >> context [
 
 	^ context ifNil: [ context := [] asContext ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContext >> context: anObject [
 	context := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContext >> debugger: aDebugger [
 
 	debugger := aDebugger
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerContext >> doesNotUnderstandNodesFor: anException [
 
 	^ (self exceptionNodesFor: anException)
@@ -84,23 +86,23 @@ StDebuggerContext >> doesNotUnderstandNodesFor: anException [
 		  yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContext >> exception [
 	^ exception ifNil:[exception := OupsNullException new]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContext >> exception: anException [
 	exception := anException 
 ]
 
-{ #category : #nodes }
+{ #category : 'nodes' }
 StDebuggerContext >> exceptionNodes [
 
 	^ self exception stDebuggerInspectorNodesFor: self
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerContext >> exceptionNodesFor: anException [
 
 	^ OrderedCollection new
@@ -111,43 +113,43 @@ StDebuggerContext >> exceptionNodesFor: anException [
 		  yourself
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerContext >> nullExceptionNodesFor: anException [
 
 	^ #(  )
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StDebuggerContext >> printOn: aStream [
 	aStream nextPutAll: context asString 
 ]
 
-{ #category : #nodes }
+{ #category : 'nodes' }
 StDebuggerContext >> receiverNodes [
 
 	^ self context receiver allInspectorNodes reject: [ :node | 
 		  node label = 'self' ]
 ]
 
-{ #category : #nodes }
+{ #category : 'nodes' }
 StDebuggerContext >> selfNode [
 
 	^ StInspectorSelfNode hostObject: (self context home ifNotNil: [:home | home receiver])
 ]
 
-{ #category : #nodes }
+{ #category : 'nodes' }
 StDebuggerContext >> stackTopNode [
 	^StInspectorStackTopNode hostObject: self context
 ]
 
-{ #category : #nodes }
+{ #category : 'nodes' }
 StDebuggerContext >> temporaryVariablesNodes [
 
 	^ self context astScope allTemps collect: [ :temp | 
 		  (StInspectorTempNode hostObject: self context) tempVariable: temp ]
 ]
 
-{ #category : #nodes }
+{ #category : 'nodes' }
 StDebuggerContext >> thisContextNode [ 
 	^StInspectorThisContextNode hostObject: self context
 ]
diff --git a/src/NewTools-Debugger/StDebuggerContextInteractionModel.class.st b/src/NewTools-Debugger/StDebuggerContextInteractionModel.class.st
index 3ee2e1685..831d6939f 100644
--- a/src/NewTools-Debugger/StDebuggerContextInteractionModel.class.st
+++ b/src/NewTools-Debugger/StDebuggerContextInteractionModel.class.st
@@ -1,33 +1,35 @@
 Class {
-	#name : #StDebuggerContextInteractionModel,
-	#superclass : #SpCodeInteractionModel,
+	#name : 'StDebuggerContextInteractionModel',
+	#superclass : 'SpCodeInteractionModel',
 	#instVars : [
 		'context',
 		'bindings'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebuggerContextInteractionModel class >> on: aContext [
 
 	^ self new context: aContext
 ]
 
-{ #category : #adding }
+{ #category : 'adding' }
 StDebuggerContextInteractionModel >> addBinding: aBinding [
 
 	self flag: 'This is experimental code to add a binding without writing code'.
 	self bindings add: aBinding 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContextInteractionModel >> behavior [
 
 	^ self context receiver class
 ]
 
-{ #category : #binding }
+{ #category : 'binding' }
 StDebuggerContextInteractionModel >> bindingOf: aString [
 
 	"we can not call #lookupVar: without checking first as it would create the variable"
@@ -38,47 +40,47 @@ StDebuggerContextInteractionModel >> bindingOf: aString [
 		  ifFalse: [ self bindings associationAt: aString ifAbsent: [ nil ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContextInteractionModel >> bindings [
 
 	^ bindings ifNil: [ bindings := Dictionary new ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContextInteractionModel >> context [
 
 	^context
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContextInteractionModel >> context: aContext [
 	context := aContext
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContextInteractionModel >> doItContext [
 
 	^ self context
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContextInteractionModel >> doItReceiver [
 
 	^ self context receiver
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StDebuggerContextInteractionModel >> hasBindingInContextOf: aString [
 	^ (context lookupVar: aString) notNil
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StDebuggerContextInteractionModel >> hasBindingInInteractionModelOf: aString [
 	"we search the name in the interaction model as we would do in a playground"
 	^ self bindings includesKey: aString
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StDebuggerContextInteractionModel >> hasBindingOf: aString [
 
 	"we lookup the name without creating a new variable then we search in the interaction model"
@@ -87,18 +89,18 @@ StDebuggerContextInteractionModel >> hasBindingOf: aString [
 		  self hasBindingInInteractionModelOf: aString ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StDebuggerContextInteractionModel >> hasUnsavedCodeChanges [
 
 	^ context notNil and: [ context sourceCode ~= owner text asString ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StDebuggerContextInteractionModel >> isScripting [
 	^context belongsToDoIt
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContextInteractionModel >> object [
 
 	^ self doItReceiver
diff --git a/src/NewTools-Debugger/StDebuggerContextPredicate.class.st b/src/NewTools-Debugger/StDebuggerContextPredicate.class.st
index 38f9a8456..0dc3b9394 100644
--- a/src/NewTools-Debugger/StDebuggerContextPredicate.class.st
+++ b/src/NewTools-Debugger/StDebuggerContextPredicate.class.st
@@ -7,84 +7,86 @@ I reference the context I describe.
 I become obsolete as soon as an action is performed on the context.
 "
 Class {
-	#name : #StDebuggerContextPredicate,
-	#superclass : #Object,
+	#name : 'StDebuggerContextPredicate',
+	#superclass : 'Object',
 	#instVars : [
 		'context',
 		'postMortem'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebuggerContextPredicate class >> context: anObject [
 
 	^ self new context: anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContextPredicate >> context [
 	^ context
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContextPredicate >> context: aContext [
 	context := aContext
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StDebuggerContextPredicate >> contextSignalsException [
 	^false
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerContextPredicate >> initialize [ 
 	super initialize.
 	postMortem := false
 ]
 
-{ #category : #predicates }
+{ #category : 'predicates' }
 StDebuggerContextPredicate >> isContextAnAssertionFailure [
 	^false
 ]
 
-{ #category : #predicates }
+{ #category : 'predicates' }
 StDebuggerContextPredicate >> isContextDead [
 	^context isDead
 ]
 
-{ #category : #predicates }
+{ #category : 'predicates' }
 StDebuggerContextPredicate >> isContextDoesNotUnderstand [
 	^false
 ]
 
-{ #category : #predicates }
+{ #category : 'predicates' }
 StDebuggerContextPredicate >> isContextMissingClassException [
 	^false
 ]
 
-{ #category : #predicates }
+{ #category : 'predicates' }
 StDebuggerContextPredicate >> isContextPostMortem [
 	^postMortem
 ]
 
-{ #category : #predicates }
+{ #category : 'predicates' }
 StDebuggerContextPredicate >> isContextSubclassResponsibilityException [
 	^false
 ]
 
-{ #category : #predicates }
+{ #category : 'predicates' }
 StDebuggerContextPredicate >> isSteppable [
 
 	^ self isContextPostMortem not and: [ self isContextDead not ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerContextPredicate >> postMortem: aBoolean [
 	postMortem := aBoolean
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StDebuggerContextPredicate >> printDescription [
 	|str|
 	str := WriteStream on: String new.
@@ -93,14 +95,14 @@ StDebuggerContextPredicate >> printDescription [
 	^str contents
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StDebuggerContextPredicate >> printDescriptionPrefixOn: str [
 
 	self printPostMortemDescriptionOn: str.
 	self printHaltDescriptionOn: str
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StDebuggerContextPredicate >> printHaltDescriptionOn: str [
 
 	context sourceNodeExecuted isHaltNode ifFalse: [ ^ self ].
@@ -108,7 +110,7 @@ StDebuggerContextPredicate >> printHaltDescriptionOn: str [
 	str space
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StDebuggerContextPredicate >> printPostMortemDescriptionOn: str [
 
 	postMortem ifFalse: [ ^ self ].
@@ -116,7 +118,7 @@ StDebuggerContextPredicate >> printPostMortemDescriptionOn: str [
 	str space
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StDebuggerContextPredicate >> updateSessionForModel: aStDebuggerActionModel [
 	aStDebuggerActionModel updateDebugSessionException: OupsNullException new
 	
diff --git a/src/NewTools-Debugger/StDebuggerErrorContextPredicate.class.st b/src/NewTools-Debugger/StDebuggerErrorContextPredicate.class.st
index 368da8b4d..5d105e9c6 100644
--- a/src/NewTools-Debugger/StDebuggerErrorContextPredicate.class.st
+++ b/src/NewTools-Debugger/StDebuggerErrorContextPredicate.class.st
@@ -4,15 +4,17 @@ I provide a specialized context description in the case where an exception was f
 I reference that exception.
 "
 Class {
-	#name : #StDebuggerErrorContextPredicate,
-	#superclass : #StDebuggerContextPredicate,
+	#name : 'StDebuggerErrorContextPredicate',
+	#superclass : 'StDebuggerContextPredicate',
 	#instVars : [
 		'exception'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerErrorContextPredicate >> assertEqualsSelectors [
 	self flag: 'Add the denies... use a pragma?'.
 	^ #(#assert:equals: #assert:closeTo:precision: #assert:closeTo: #assert:identicalTo: #assertCollection:equals: #assertCollection:hasSameElements:)
@@ -22,17 +24,17 @@ StDebuggerErrorContextPredicate >> assertEqualsSelectors [
 	     #assertCollection:hasSameElements: )"
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StDebuggerErrorContextPredicate >> contextSignalsException [
 	^true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerErrorContextPredicate >> exception: anObject [
 	exception := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerErrorContextPredicate >> exceptionWhiteList [
 
 	^ { 
@@ -41,7 +43,7 @@ StDebuggerErrorContextPredicate >> exceptionWhiteList [
 		  Halt }
 ]
 
-{ #category : #predicates }
+{ #category : 'predicates' }
 StDebuggerErrorContextPredicate >> isContextDoesNotUnderstand [
 
 	^ exception class = MessageNotUnderstood and: [ 
@@ -52,18 +54,18 @@ StDebuggerErrorContextPredicate >> isContextDoesNotUnderstand [
 				  exception signalerContext method methodClass == Object ] ]
 ]
 
-{ #category : #predicates }
+{ #category : 'predicates' }
 StDebuggerErrorContextPredicate >> isContextMissingClassException [
 
 	^ #(#UndeclaredVariableRead #UndeclaredVariableWrite) includes: exception class name
 ]
 
-{ #category : #predicates }
+{ #category : 'predicates' }
 StDebuggerErrorContextPredicate >> isContextSubclassResponsibilityException [
 	^ exception class == SubclassResponsibility
 ]
 
-{ #category : #predicates }
+{ #category : 'predicates' }
 StDebuggerErrorContextPredicate >> isSteppable [
 
 	super isSteppable ifFalse: [ ^ false ].
@@ -75,7 +77,7 @@ StDebuggerErrorContextPredicate >> isSteppable [
 	^ exception isResumable
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StDebuggerErrorContextPredicate >> printDescription [
 
 	| str |
@@ -87,7 +89,7 @@ StDebuggerErrorContextPredicate >> printDescription [
 	^ str contents
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StDebuggerErrorContextPredicate >> updateSessionForModel: aStDebuggerActionModel [
 
 	aStDebuggerActionModel updateDebugSessionException: exception
diff --git a/src/NewTools-Debugger/StDebuggerExtensionActivationToggle.class.st b/src/NewTools-Debugger/StDebuggerExtensionActivationToggle.class.st
index 70c645d56..5d02d455f 100644
--- a/src/NewTools-Debugger/StDebuggerExtensionActivationToggle.class.st
+++ b/src/NewTools-Debugger/StDebuggerExtensionActivationToggle.class.st
@@ -1,13 +1,15 @@
 Class {
-	#name : #StDebuggerExtensionActivationToggle,
-	#superclass : #Announcement,
+	#name : 'StDebuggerExtensionActivationToggle',
+	#superclass : 'Announcement',
 	#instVars : [
 		'debuggerExtensionClass'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerExtensionActivationToggle class >> debuggerExtensionClass: aDebuggerExtensionClass [
 
 	^ self new
@@ -15,13 +17,13 @@ StDebuggerExtensionActivationToggle class >> debuggerExtensionClass: aDebuggerEx
 		  yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerExtensionActivationToggle >> debuggerExtensionClass [
 
 	^ debuggerExtensionClass
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerExtensionActivationToggle >> debuggerExtensionClass: anObject [
 
 	debuggerExtensionClass := anObject
diff --git a/src/NewTools-Debugger/StDebuggerExtensionInspectorNodeBuilderVisitor.class.st b/src/NewTools-Debugger/StDebuggerExtensionInspectorNodeBuilderVisitor.class.st
index 0a945def1..e22f45bf9 100644
--- a/src/NewTools-Debugger/StDebuggerExtensionInspectorNodeBuilderVisitor.class.st
+++ b/src/NewTools-Debugger/StDebuggerExtensionInspectorNodeBuilderVisitor.class.st
@@ -2,12 +2,14 @@
 I am a debugger extension visitor that is used to display in the debugger inspector variables that were added via debugger extensions.
 "
 Class {
-	#name : #StDebuggerExtensionInspectorNodeBuilderVisitor,
-	#superclass : #StDebuggerExtensionVisitor,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerExtensionInspectorNodeBuilderVisitor',
+	#superclass : 'StDebuggerExtensionVisitor',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerExtensionInspectorNodeBuilderVisitor >> initializeResult [
 
 	result := OrderedCollection new
diff --git a/src/NewTools-Debugger/StDebuggerExtensionSettings.class.st b/src/NewTools-Debugger/StDebuggerExtensionSettings.class.st
index ea17627fb..cf32f68d9 100644
--- a/src/NewTools-Debugger/StDebuggerExtensionSettings.class.st
+++ b/src/NewTools-Debugger/StDebuggerExtensionSettings.class.st
@@ -2,12 +2,14 @@
 I define settings to configure debugger extensions, *i.e.*, all users of `TStDebuggerExtension`.
 "
 Class {
-	#name : #StDebuggerExtensionSettings,
-	#superclass : #Object,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerExtensionSettings',
+	#superclass : 'Object',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #settings }
+{ #category : 'settings' }
 StDebuggerExtensionSettings class >> debuggerExtensionSettingsForClass: toolClass builder: aBuilder [
 
 	| toolName |
@@ -30,7 +32,7 @@ StDebuggerExtensionSettings class >> debuggerExtensionSettingsForClass: toolClas
 					'Position of the tool tab in the debugger right column.' ]
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 StDebuggerExtensionSettings class >> debuggerExtensionSettingsOn: aBuilder [
 
 	<systemsettings>
diff --git a/src/NewTools-Debugger/StDebuggerExtensionVisitor.class.st b/src/NewTools-Debugger/StDebuggerExtensionVisitor.class.st
index 0a828fe11..dd6fac227 100644
--- a/src/NewTools-Debugger/StDebuggerExtensionVisitor.class.st
+++ b/src/NewTools-Debugger/StDebuggerExtensionVisitor.class.st
@@ -11,47 +11,49 @@ NewExtension>>#accept: aVisitor
 ```
 "
 Class {
-	#name : #StDebuggerExtensionVisitor,
-	#superclass : #Object,
+	#name : 'StDebuggerExtensionVisitor',
+	#superclass : 'Object',
 	#instVars : [
 		'result'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerExtensionVisitor >> initialize [ 
 
 	super initialize.
 	self initializeResult
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerExtensionVisitor >> initializeResult [
 
 	self subclassResponsibility 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerExtensionVisitor >> result [
 
 	^ result
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 StDebuggerExtensionVisitor >> visit: aStDebuggerExtension [
 
 	aStDebuggerExtension accept: self
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 StDebuggerExtensionVisitor >> visitBreakpoints: aBreakpointsExtension [
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 StDebuggerExtensionVisitor >> visitBytecode: aBytecodeExtension [
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 StDebuggerExtensionVisitor >> visitSindarin: aSindarinExtension [
 ]
diff --git a/src/NewTools-Debugger/StDebuggerInspector.class.st b/src/NewTools-Debugger/StDebuggerInspector.class.st
index 642125d1b..e31fdb1ac 100644
--- a/src/NewTools-Debugger/StDebuggerInspector.class.st
+++ b/src/NewTools-Debugger/StDebuggerInspector.class.st
@@ -6,8 +6,8 @@ I add specific debugger functionalities:
 - I dynamically change my layout depending on the context (e.g., I show a diff view in case of an assertion failure)
 "
 Class {
-	#name : #StDebuggerInspector,
-	#superclass : #SpPresenter,
+	#name : 'StDebuggerInspector',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'inspector',
 		'model',
@@ -21,41 +21,43 @@ Class {
 	#classInstVars : [
 		'maximizeAssertionSpec'
 	],
-	#category : #'NewTools-Debugger-View'
+	#category : 'NewTools-Debugger-View',
+	#package : 'NewTools-Debugger',
+	#tag : 'View'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StDebuggerInspector class >> maximizeAssertionSpec [
 	^maximizeAssertionSpec ifNil:[maximizeAssertionSpec := false]
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StDebuggerInspector class >> maximizeAssertionSpec: aboolean [
 	maximizeAssertionSpec := aboolean
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebuggerInspector class >> openOn: anObject [
 
 	^ (self on: (StInspectorModel on: anObject)) open
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StDebuggerInspector class >> title [
 	 ^'Debugger Inspection'
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StDebuggerInspector class >> toggleMaximizeAssertionSpec [
 	self maximizeAssertionSpec: self maximizeAssertionSpec not
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerInspector >> assertionFailure [
 	^assertionFailure 
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StDebuggerInspector >> assertionFailureLayout [
 	| assertionFailureLayout |
 	
@@ -76,22 +78,22 @@ StDebuggerInspector >> assertionFailureLayout [
 	^ assertionFailureLayout
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StDebuggerInspector >> assertionLayoutSelector [
 	^#assertionFailureLayout
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StDebuggerInspector >> currentLayoutSelector [
 	^currentLayoutSelector
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerInspector >> debuggerInspectorModelClass [
 	^ StDebuggerInspectorModel
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StDebuggerInspector >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
@@ -99,38 +101,38 @@ StDebuggerInspector >> defaultLayout [
 		  yourself
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StDebuggerInspector >> defaultLayoutSelector [
 	^#defaultLayout
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StDebuggerInspector >> forceRawInspectionUpdate [
 
 	self getRawInspectorPresenterOrNil ifNotNil: [ :inspection | 
 		inspection update ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StDebuggerInspector >> getRawInspectorPresenterOrNil [
 	^ inspector millerList pages first rawInspectorPageOrNil activePresenter
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StDebuggerInspector >> getRawInspectorSelectedPath [
 	^ self getRawInspectorPresenterOrNil
 		  ifNil: [ #(  ) ]
 		  ifNotNil: [ :raw | raw selectedPath ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerInspector >> initialize [
 
 	super initialize.
 	shouldBeUpdated := false
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerInspector >> initializeLateralToolbar [
 	| button |
 	
@@ -151,7 +153,7 @@ StDebuggerInspector >> initializeLateralToolbar [
 	lateralToolbar add: button
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerInspector >> initializePresenters [
 
 	label := self newLabel.
@@ -160,38 +162,38 @@ StDebuggerInspector >> initializePresenters [
 	self initializeLateralToolbar
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerInspector >> inspectedObject [
 
 	^ self model inspectedObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerInspector >> label: aString [
 
 	label label: aString
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StDebuggerInspector >> model [
 
 	^ model
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StDebuggerInspector >> model: aModel [
 
 	model := aModel.
 	inspector model: model
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerInspector >> rawInspectionSelectionCache [
 	^ rawInspectionSelectionCache ifNil: [ 
 		  rawInspectionSelectionCache := Dictionary new ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StDebuggerInspector >> restoreRawInspectionSelectionForContext: aContext [
 	aContext ifNil: [ ^ self ].
 	self getRawInspectorPresenterOrNil
@@ -212,7 +214,7 @@ StDebuggerInspector >> restoreRawInspectionSelectionForContext: aContext [
 			raw selectPath: path ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 StDebuggerInspector >> saveRawInspectionSelectionForContext: aContext [
 	| selectionPath |
 	aContext ifNil: [ ^ self ].
@@ -225,43 +227,43 @@ StDebuggerInspector >> saveRawInspectionSelectionForContext: aContext [
 		put: selectionPath
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StDebuggerInspector >> setAssertionLayout [
 	currentLayoutSelector := self assertionLayoutSelector.
 	self layout: self assertionFailureLayout
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StDebuggerInspector >> setDefaultLayout [
 	
 	currentLayoutSelector := self defaultLayoutSelector.
 	self layout: self defaultLayout
 ]
 
-{ #category : #'accessing - model' }
+{ #category : 'accessing - model' }
 StDebuggerInspector >> setModelBeforeInitialization: aModel [
 
 	model := aModel
 ]
 
-{ #category : #asserting }
+{ #category : 'asserting' }
 StDebuggerInspector >> shouldUpdate [
 
 	shouldBeUpdated := true
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StDebuggerInspector >> shouldUpdateContext: oldContext with: newContext [
 
 	^ oldContext ~~ newContext or: [ shouldBeUpdated ]
 ]
 
-{ #category : #stepping }
+{ #category : 'stepping' }
 StDebuggerInspector >> step [
 	inspector step
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StDebuggerInspector >> updateEvaluationPaneReceiver [
 	"| context evaluator |
 	
@@ -270,7 +272,7 @@ StDebuggerInspector >> updateEvaluationPaneReceiver [
 	evaluator beForContextReceiver: context"
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 StDebuggerInspector >> updateLayoutForContexts: aContext isAssertionFailure: isTopContextFailingAssertion [
 
 	| assertionResult |
@@ -292,7 +294,7 @@ StDebuggerInspector >> updateLayoutForContexts: aContext isAssertionFailure: isT
 	self setAssertionLayout
 ]
 
-{ #category : #updating }
+{ #category : 'updating' }
 StDebuggerInspector >> updateWith: inspectedObject [
 
 	| oldContext newContext |
diff --git a/src/NewTools-Debugger/StDebuggerInspectorModel.class.st b/src/NewTools-Debugger/StDebuggerInspectorModel.class.st
index 19642c5e9..3b2299385 100644
--- a/src/NewTools-Debugger/StDebuggerInspectorModel.class.st
+++ b/src/NewTools-Debugger/StDebuggerInspectorModel.class.st
@@ -3,41 +3,43 @@ I am a model representing the first variable lists in the debugger inspector.
 
 "
 Class {
-	#name : #StDebuggerInspectorModel,
-	#superclass : #StInspectorModel,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerInspectorModel',
+	#superclass : 'StInspectorModel',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerInspectorModel >> allInspectorNodes [
 
 	^ self inspectedObject buildInspectorNodes
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerInspectorModel >> debuggerContextClass [
 	^ StDebuggerContext
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerInspectorModel >> defaultObjectInspectorClass [
 
 	^ StDebuggerRawObjectInspector
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerInspectorModel >> initialize [
 	super initialize.
 	inspectedObject := self debuggerContextClass new
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerInspectorModel >> inspectedObject [
 
 	^ inspectedObject ifNil: [ inspectedObject := self debuggerContextClass new ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerInspectorModel >> labelString [
 
 	^ (self descriptionStringFor: self inspectedObject context receiver) 
diff --git a/src/NewTools-Debugger/StDebuggerRawObjectInspector.class.st b/src/NewTools-Debugger/StDebuggerRawObjectInspector.class.st
index 011fdb3f4..93b07a315 100644
--- a/src/NewTools-Debugger/StDebuggerRawObjectInspector.class.st
+++ b/src/NewTools-Debugger/StDebuggerRawObjectInspector.class.st
@@ -4,15 +4,17 @@ I show only a compacted raw view instead of a notebook page, in particular I rem
 Activating one of my items (by clicking or double-clicking on it) shows a miller list with a standard object inspector.
 "
 Class {
-	#name : #StDebuggerRawObjectInspector,
-	#superclass : #StObjectInspectorPresenter,
+	#name : 'StDebuggerRawObjectInspector',
+	#superclass : 'StObjectInspectorPresenter',
 	#instVars : [
 		'raw'
 	],
-	#category : #'NewTools-Debugger-View'
+	#category : 'NewTools-Debugger-View',
+	#package : 'NewTools-Debugger',
+	#tag : 'View'
 }
 
-{ #category : #specs }
+{ #category : 'specs' }
 StDebuggerRawObjectInspector class >> noHeaderSpec [
 	<spec: #default>
 	^ SpBoxLayout newTopToBottom
@@ -20,7 +22,7 @@ StDebuggerRawObjectInspector class >> noHeaderSpec [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerRawObjectInspector >> defaultLayout [
 	
 	^ SpBoxLayout newTopToBottom 
@@ -30,7 +32,7 @@ StDebuggerRawObjectInspector >> defaultLayout [
 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerRawObjectInspector >> initializePresenters [
 
 
@@ -42,24 +44,24 @@ StDebuggerRawObjectInspector >> initializePresenters [
 	super initializePresenters
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerRawObjectInspector >> rawInspectorPageOrNil [
 	^raw
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerRawObjectInspector >> selectedObject [
 	"The debugger raw object inspector is opened on a StDebuggerContext object that holds context information. Here the view expected by users is on the receiver and not on the StDebuggerContext."
 	^super selectedObject context receiver
 ]
 
-{ #category : #stepping }
+{ #category : 'stepping' }
 StDebuggerRawObjectInspector >> step [
 	super step.
 	raw step
 ]
 
-{ #category : #'private - updating' }
+{ #category : 'private - updating' }
 StDebuggerRawObjectInspector >> updateHeaderBar [
 	| filter |
 
diff --git a/src/NewTools-Debugger/StDebuggerSpecSelector.class.st b/src/NewTools-Debugger/StDebuggerSpecSelector.class.st
index 9bb859a5f..834501d1a 100644
--- a/src/NewTools-Debugger/StDebuggerSpecSelector.class.st
+++ b/src/NewTools-Debugger/StDebuggerSpecSelector.class.st
@@ -15,52 +15,54 @@ Three cases:
 		- AND at least one existing extension class is activated as debugger extension
 "
 Class {
-	#name : #StDebuggerSpecSelector,
-	#superclass : #Object,
+	#name : 'StDebuggerSpecSelector',
+	#superclass : 'Object',
 	#instVars : [
 		'specSelector'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerSpecSelector class >> debuggerClass [ 	
 	^StDebugger
 ]
 
-{ #category : #'specs - default selectors' }
+{ #category : 'specs - default selectors' }
 StDebuggerSpecSelector class >> defaultDebuggerWithExtensionSpecSelector [
 	^#debuggerWithExtensionsSpec
 ]
 
-{ #category : #'specs - default selectors' }
+{ #category : 'specs - default selectors' }
 StDebuggerSpecSelector class >> defaultDebuggerWithoutExtensionSpecSelector [
 	^#debuggerWithoutExtensionsSpec
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebuggerSpecSelector class >> defaultSelector [
 	^self on: self defaultDebuggerWithExtensionSpecSelector
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StDebuggerSpecSelector class >> on: aSelector [
 	^self new specSelector: aSelector
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerSpecSelector >> debuggerClass [ 
 	^self class debuggerClass
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 StDebuggerSpecSelector >> isDefaultSelector: aSelector [
 	^ {self class defaultDebuggerWithExtensionSpecSelector.
 	self class defaultDebuggerWithoutExtensionSpecSelector}
 		includes: aSelector
 ]
 
-{ #category : #'specs - selectors' }
+{ #category : 'specs - selectors' }
 StDebuggerSpecSelector >> selectExtensionActivationSpecFrom: aDefaultSpecSelector [
 
 	"Altered depending on the current configuration of the debugger extensions.
@@ -75,7 +77,7 @@ StDebuggerSpecSelector >> selectExtensionActivationSpecFrom: aDefaultSpecSelecto
 				   self debuggerClass extensionToolsClasses)
 ]
 
-{ #category : #'specs - selectors' }
+{ #category : 'specs - selectors' }
 StDebuggerSpecSelector >> selectSpecSelector [
 	"Sets and returns the spec selector to be use by the presenter.
 	Two cases:
@@ -91,7 +93,7 @@ StDebuggerSpecSelector >> selectSpecSelector [
 	^ self selectExtensionActivationSpecFrom: selector
 ]
 
-{ #category : #'specs - selectors' }
+{ #category : 'specs - selectors' }
 StDebuggerSpecSelector >> selectorForDebuggerStatus: debuggerExtensionsActivated extensionsStatus: debuggerHasExtensions [
 	"This is only relevant in the case we use default StDebugger specs for which the extension column can be configured in settings"
 
@@ -100,12 +102,12 @@ StDebuggerSpecSelector >> selectorForDebuggerStatus: debuggerExtensionsActivated
 		ifFalse: [ self class defaultDebuggerWithoutExtensionSpecSelector ]
 ]
 
-{ #category : #'specs - default selector' }
+{ #category : 'specs - default selector' }
 StDebuggerSpecSelector >> specSelector [
 	^ specSelector
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerSpecSelector >> specSelector: anObject [
 	specSelector := anObject
 ]
diff --git a/src/NewTools-Debugger/StDebuggerStackCommandTreeBuilder.class.st b/src/NewTools-Debugger/StDebuggerStackCommandTreeBuilder.class.st
index 3e627f716..13ed40fb2 100644
--- a/src/NewTools-Debugger/StDebuggerStackCommandTreeBuilder.class.st
+++ b/src/NewTools-Debugger/StDebuggerStackCommandTreeBuilder.class.st
@@ -8,37 +8,39 @@ As I provide the default debugger commands, you should only extend me by using t
 Using me to add command in the tree makes them default for the debugger stack presenter.
 "
 Class {
-	#name : #StDebuggerStackCommandTreeBuilder,
-	#superclass : #StDebuggerCommandTreeBuilder,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerStackCommandTreeBuilder',
+	#superclass : 'StDebuggerCommandTreeBuilder',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder class >> displayStrategy [
 	^CmUIDisplayAsSubMenu
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder class >> groupDescription [
 	^ 'Actions on the debugger stack.'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder class >> groupName [ 	
 	^'Stack'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder >> browseGroupDescription [
 	^ 'Navigate the system from the stack'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder >> browseGroupName [
 	^ 'Browse'
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerStackCommandTreeBuilder >> buildDebuggerCommandGroup [
 	|stackGroup|
 	stackGroup := self group.	
@@ -50,7 +52,7 @@ StDebuggerStackCommandTreeBuilder >> buildDebuggerCommandGroup [
 	
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerStackCommandTreeBuilder >> buildSpecCommand: aCommandClass forContext: aBlock [
 
 	| cmd |
@@ -59,14 +61,14 @@ StDebuggerStackCommandTreeBuilder >> buildSpecCommand: aCommandClass forContext:
 	^ cmd
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerStackCommandTreeBuilder >> stackActionsCommandsClasses [
 	^ {
 	StReturnValueCommand
 	}
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerStackCommandTreeBuilder >> stackContextMenuActionsCommands [
 	| group |
 	group := (CmCommandGroup named: self stackContextMenuActionsGroupName)
@@ -81,17 +83,17 @@ StDebuggerStackCommandTreeBuilder >> stackContextMenuActionsCommands [
 	^ group
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder >> stackContextMenuActionsDescription [
 	^ 'Actions on the selected context'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder >> stackContextMenuActionsGroupName [
 	^ 'Context Actions'
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerStackCommandTreeBuilder >> stackContextMenuBrowseCommands [
 	| group |
 	group := (CmCommandGroup named: self browseGroupName) asSpecGroup.
@@ -104,7 +106,7 @@ StDebuggerStackCommandTreeBuilder >> stackContextMenuBrowseCommands [
 	^ group
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerStackCommandTreeBuilder >> stackContextMenuExplorationCommands [
 	| group |
 	group := (CmCommandGroup
@@ -128,17 +130,17 @@ StDebuggerStackCommandTreeBuilder >> stackContextMenuExplorationCommands [
 	^ group
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder >> stackContextMenuExplorationDescription [
 	^ 'Explore the receiver object''s graph'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder >> stackContextMenuExplorationGroupName [
 	^ 'Explore'
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerStackCommandTreeBuilder >> stackContextMenuStackEditionsCommands [
 	| group |
 	group := (CmCommandGroup named: self stackGroupName) asSpecGroup.
@@ -151,7 +153,7 @@ StDebuggerStackCommandTreeBuilder >> stackContextMenuStackEditionsCommands [
 	^ group
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerStackCommandTreeBuilder >> stackContextNavigationCommands [
 	"Commands to navigate the context"
 
@@ -169,12 +171,12 @@ StDebuggerStackCommandTreeBuilder >> stackContextNavigationCommands [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder >> stackContextNavigationGroupName [
 	^ 'Receiver class code navigation commands'
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerStackCommandTreeBuilder >> stackEditionCommandsClasses [
 	^ {
 	StCopyStackToClipboardCommand.
@@ -184,7 +186,7 @@ StDebuggerStackCommandTreeBuilder >> stackEditionCommandsClasses [
 	}
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerStackCommandTreeBuilder >> stackExplorationCommandsClasses [
 	^ OrderedCollection new
 		addAll: self stackReceiverClassExplorationCommandsClasses;
@@ -192,17 +194,17 @@ StDebuggerStackCommandTreeBuilder >> stackExplorationCommandsClasses [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder >> stackGroupDescription [
 	^ 'Stack edition'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder >> stackGroupName [
 	^ 'Stack'
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerStackCommandTreeBuilder >> stackMethodCommandsClasses [
 	^ {
 	SpBrowseMethodInheritanceCommand.
@@ -210,7 +212,7 @@ StDebuggerStackCommandTreeBuilder >> stackMethodCommandsClasses [
 	}
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerStackCommandTreeBuilder >> stackMethodNavigationCommands [
 
 	"Commands to navigate the selected context's method "
@@ -225,12 +227,12 @@ StDebuggerStackCommandTreeBuilder >> stackMethodNavigationCommands [
 	^ group
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder >> stackMethodNavigationGroupName [
 	^ 'Selected method navigation commands'
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerStackCommandTreeBuilder >> stackMethodSelectorCommandsClasses [
 	^ {
 	SpBrowseImplementorsCommand.
@@ -239,7 +241,7 @@ StDebuggerStackCommandTreeBuilder >> stackMethodSelectorCommandsClasses [
 	}
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerStackCommandTreeBuilder >> stackMethodSelectorNavigationCommands [
 	"Commands to navigate the selected context's method selector as context "
 
@@ -257,12 +259,12 @@ StDebuggerStackCommandTreeBuilder >> stackMethodSelectorNavigationCommands [
 	^ group
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder >> stackMethodSelectorNavigationGroupName [
 	^ 'Selected method''s selector navigation commands'
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerStackCommandTreeBuilder >> stackReceiverClassExplorationCommandsClasses [
 	^ {
 	SpBrowseInstancesCommand.
@@ -270,7 +272,7 @@ StDebuggerStackCommandTreeBuilder >> stackReceiverClassExplorationCommandsClasse
 	}
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerStackCommandTreeBuilder >> stackReceiverClassNavigationCommands [
 	"Commands to navigate the selected context's receiver class as context "
 
@@ -288,12 +290,12 @@ StDebuggerStackCommandTreeBuilder >> stackReceiverClassNavigationCommands [
 	^ group
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerStackCommandTreeBuilder >> stackReceiverClassNavigationGroupName [
 	^ 'Receiver class navigation commands'
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerStackCommandTreeBuilder >> stackReceiverCommandsClasses [
 	^ {
 	SpBrowseClassReferencesCommand.
@@ -304,7 +306,7 @@ StDebuggerStackCommandTreeBuilder >> stackReceiverCommandsClasses [
 	}
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerStackCommandTreeBuilder >> stackReceiverExplorationCommandsClasses [
 	^ {SpBrowsePointersToCommand}
 ]
diff --git a/src/NewTools-Debugger/StDebuggerTestFailureContextPredicate.class.st b/src/NewTools-Debugger/StDebuggerTestFailureContextPredicate.class.st
index 3f62a0a52..4cc464aca 100644
--- a/src/NewTools-Debugger/StDebuggerTestFailureContextPredicate.class.st
+++ b/src/NewTools-Debugger/StDebuggerTestFailureContextPredicate.class.st
@@ -5,35 +5,37 @@ I reference that test  failure.
 
 "
 Class {
-	#name : #StDebuggerTestFailureContextPredicate,
-	#superclass : #StDebuggerContextPredicate,
+	#name : 'StDebuggerTestFailureContextPredicate',
+	#superclass : 'StDebuggerContextPredicate',
 	#instVars : [
 		'failure'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 StDebuggerTestFailureContextPredicate >> contextSignalsException [
 	^true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerTestFailureContextPredicate >> failure: anObject [
 	failure := anObject
 ]
 
-{ #category : #predicates }
+{ #category : 'predicates' }
 StDebuggerTestFailureContextPredicate >> isContextAnAssertionFailure [
 	^true
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StDebuggerTestFailureContextPredicate >> isSteppable [ 
 	^false
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 StDebuggerTestFailureContextPredicate >> printDescription [
 
 	| str |
diff --git a/src/NewTools-Debugger/StDebuggerToolbarCommandTreeBuilder.class.st b/src/NewTools-Debugger/StDebuggerToolbarCommandTreeBuilder.class.st
index dc39e93f2..6d4c28591 100644
--- a/src/NewTools-Debugger/StDebuggerToolbarCommandTreeBuilder.class.st
+++ b/src/NewTools-Debugger/StDebuggerToolbarCommandTreeBuilder.class.st
@@ -8,27 +8,29 @@ As I provide the default debugger commands, you should only extend me by using t
 Using me to add command in the tree makes them default for the debugger  toolbar presenter.
 "
 Class {
-	#name : #StDebuggerToolbarCommandTreeBuilder,
-	#superclass : #StDebuggerCommandTreeBuilder,
-	#category : #'NewTools-Debugger-Model'
+	#name : 'StDebuggerToolbarCommandTreeBuilder',
+	#superclass : 'StDebuggerCommandTreeBuilder',
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerToolbarCommandTreeBuilder class >> displayStrategy [
 	^CmUIDisplayAsGroup
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerToolbarCommandTreeBuilder class >> groupDescription [
 	^ 'Debug actions'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerToolbarCommandTreeBuilder class >> groupName [ 	
 	^'Toolbar'
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerToolbarCommandTreeBuilder >> buildCommandGroupFrom: commandClasses named: commandGroupName description: commandGroupDescription [
 	| group |
 	group := (CmCommandGroup named: commandGroupName) asSpecGroup.
@@ -42,7 +44,7 @@ StDebuggerToolbarCommandTreeBuilder >> buildCommandGroupFrom: commandClasses nam
 	^ group
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 StDebuggerToolbarCommandTreeBuilder >> buildDebuggerCommandGroup [
 	|group|
 	group := self group.
@@ -53,12 +55,12 @@ StDebuggerToolbarCommandTreeBuilder >> buildDebuggerCommandGroup [
 	
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerToolbarCommandTreeBuilder >> contextControlCommandClasses [
 	^ {StDefineMissingEntityCommand}
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerToolbarCommandTreeBuilder >> contextControlDebuggingCommands [
 	^ self
 		buildCommandGroupFrom: self contextControlCommandClasses
@@ -66,24 +68,24 @@ StDebuggerToolbarCommandTreeBuilder >> contextControlDebuggingCommands [
 		description: self contextControlGroupDescription
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerToolbarCommandTreeBuilder >> contextControlGroupDescription [
 	^'Actions performed on the interrupted context'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerToolbarCommandTreeBuilder >> contextControlGroupName [
 	^'Context control'
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerToolbarCommandTreeBuilder >> contextRequestCommandClasses [
 	^ {
 	StWhereIsCommand
 	}
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerToolbarCommandTreeBuilder >> contextRequestDebuggingCommands [
 	^ self
 		buildCommandGroupFrom: self contextRequestCommandClasses
@@ -91,27 +93,27 @@ StDebuggerToolbarCommandTreeBuilder >> contextRequestDebuggingCommands [
 		description: self contextRequestGroupDescription
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerToolbarCommandTreeBuilder >> contextRequestGroupDescription [
 	^ 'Requests on the interrupted context'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerToolbarCommandTreeBuilder >> contextRequestGroupName [
 	^'Context requests'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerToolbarCommandTreeBuilder >> defaultDebugActionsDescription [
 	^'Defaults debugging actions'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerToolbarCommandTreeBuilder >> defaultDebugActionsGroupName [
 	^'Debugging actions'
 ]
 
-{ #category : #'accessing - commands classes' }
+{ #category : 'accessing - commands classes' }
 StDebuggerToolbarCommandTreeBuilder >> executionControlCommandClasses [
 	^ {
 	StProceedCommand.
@@ -124,7 +126,7 @@ StDebuggerToolbarCommandTreeBuilder >> executionControlCommandClasses [
 	}
 ]
 
-{ #category : #commands }
+{ #category : 'commands' }
 StDebuggerToolbarCommandTreeBuilder >> executionControlDebuggingCommands [
 	^ self
 		buildCommandGroupFrom: self executionControlCommandClasses
@@ -132,12 +134,12 @@ StDebuggerToolbarCommandTreeBuilder >> executionControlDebuggingCommands [
 		description: self executionControlGroupDescription
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerToolbarCommandTreeBuilder >> executionControlGroupDescription [
 	^'Debug actions applied to the executed context'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerToolbarCommandTreeBuilder >> executionControlGroupName [
 	^'Execution control'
 ]
diff --git a/src/NewTools-Debugger/StDebuggerTreeTablePresenter.class.st b/src/NewTools-Debugger/StDebuggerTreeTablePresenter.class.st
index 92d303360..1de6e224d 100644
--- a/src/NewTools-Debugger/StDebuggerTreeTablePresenter.class.st
+++ b/src/NewTools-Debugger/StDebuggerTreeTablePresenter.class.st
@@ -6,17 +6,19 @@ I'm used to display all variables that are my roots. I can filter these variable
 In the debugger, I'm used to display all variables in the selected context and you can filter/unfilter them by clicking/double-clicking one of their variable tag.
 "
 Class {
-	#name : #StDebuggerTreeTablePresenter,
-	#superclass : #SpTreeTablePresenter,
+	#name : 'StDebuggerTreeTablePresenter',
+	#superclass : 'SpTreeTablePresenter',
 	#instVars : [
 		'items',
 		'filter',
 		'isFiltered'
 	],
-	#category : #'NewTools-Debugger-View'
+	#category : 'NewTools-Debugger-View',
+	#package : 'NewTools-Debugger',
+	#tag : 'View'
 }
 
-{ #category : #api }
+{ #category : 'api' }
 StDebuggerTreeTablePresenter >> applyFilter [
 
 	filter ifNil: [ ^ items ].
@@ -27,23 +29,23 @@ StDebuggerTreeTablePresenter >> applyFilter [
 	^ items select: [ :item | item variableTag = filter ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StDebuggerTreeTablePresenter >> filter [
 	^ filter
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StDebuggerTreeTablePresenter >> hasActiveFilter [
 	^isFiltered 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StDebuggerTreeTablePresenter >> initialize [
 	super initialize.
 	isFiltered := false
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StDebuggerTreeTablePresenter >> roots: aCollection [
 
 	items := aCollection.
@@ -51,7 +53,7 @@ StDebuggerTreeTablePresenter >> roots: aCollection [
 
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 StDebuggerTreeTablePresenter >> toggleFilter: aVariableTag [
 
 	filter := aVariableTag.
diff --git a/src/NewTools-Debugger/StFailingAssertionInspector.class.st b/src/NewTools-Debugger/StFailingAssertionInspector.class.st
index 865eaef2f..25897fa5f 100644
--- a/src/NewTools-Debugger/StFailingAssertionInspector.class.st
+++ b/src/NewTools-Debugger/StFailingAssertionInspector.class.st
@@ -10,8 +10,8 @@ Only opens for following assertions failures:
 #assertCollection:hasSameElements:
 "
 Class {
-	#name : #StFailingAssertionInspector,
-	#superclass : #SpPresenter,
+	#name : 'StFailingAssertionInspector',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'actualObjectHeader',
 		'expectedObjectHeader',
@@ -21,10 +21,12 @@ Class {
 		'expectedObjectMillerList',
 		'stringDiff'
 	],
-	#category : #'NewTools-Debugger-View'
+	#category : 'NewTools-Debugger-View',
+	#package : 'NewTools-Debugger',
+	#tag : 'View'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 StFailingAssertionInspector class >> defaultLayout [
 
 	^ SpPanedLayout newLeftToRight
@@ -40,7 +42,7 @@ StFailingAssertionInspector class >> defaultLayout [
 		  yourself
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 StFailingAssertionInspector class >> diffInspectorsFromActual: actualObject expected: expectedObject application: aStApplication [
 
 	| diffPresenter |
@@ -56,51 +58,51 @@ StFailingAssertionInspector class >> diffInspectorsFromActual: actualObject expe
 	^ diffPresenter
 ]
 
-{ #category : #specs }
+{ #category : 'specs' }
 StFailingAssertionInspector class >> stringSpec [
 	^ SpBoxLayout newTopToBottom
 		add: #stringDiff;
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFailingAssertionInspector >> actualObject [
 	^ actualObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFailingAssertionInspector >> actualObject: anObject [
 	actualObject := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFailingAssertionInspector >> actualObjectMillerList [
 	^ actualObjectMillerList
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFailingAssertionInspector >> expectedObject [
 	^ expectedObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFailingAssertionInspector >> expectedObject: anObject [
 	expectedObject := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFailingAssertionInspector >> expectedObjectMillerList [
 	^ expectedObjectMillerList
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFailingAssertionInspector >> initializeMillerList: list forObject: object [
 	list
 		presenterBlock: [ :aModel | self treeTableInspectionFor: aModel ];
 		setRootModel: object 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFailingAssertionInspector >> initializeObjectDiffPresenters [
 			
 	actualObjectHeader := (self instantiate: StHeaderBar)
@@ -120,13 +122,13 @@ StFailingAssertionInspector >> initializeObjectDiffPresenters [
 		forObject: expectedObject
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFailingAssertionInspector >> initializePresenters [
 
 	actualObject presentDiffWith: expectedObject in: self
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 StFailingAssertionInspector >> initializeStringDiffPresenters [
 	
 	stringDiff := self newDiff.
@@ -137,12 +139,12 @@ StFailingAssertionInspector >> initializeStringDiffPresenters [
 	stringDiff rightText: expectedObject printString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 StFailingAssertionInspector >> stringDiff [
 	^stringDiff
 ]
 
-{ #category : #views }
+{ #category : 'views' }
 StFailingAssertionInspector >> treeTableInspectionFor: aModel [
 	| rawInspection |
 	rawInspection := StRawInspectionPresenter new.
diff --git a/src/NewTools-Debugger/StRawInspectionPresenter.extension.st b/src/NewTools-Debugger/StRawInspectionPresenter.extension.st
index 0cbcbb58f..43008ae4e 100644
--- a/src/NewTools-Debugger/StRawInspectionPresenter.extension.st
+++ b/src/NewTools-Debugger/StRawInspectionPresenter.extension.st
@@ -1,23 +1,23 @@
-Extension { #name : #StRawInspectionPresenter }
+Extension { #name : 'StRawInspectionPresenter' }
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 StRawInspectionPresenter >> activePresenter [
 	^self
 ]
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 StRawInspectionPresenter >> addVariableTagColumn [
 
 	attributeTable addColumn: self variableTagColumn
 ]
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 StRawInspectionPresenter >> attributeTable [
 
 	^attributeTable
 ]
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 StRawInspectionPresenter >> beForDebugger [
 
 	attributeTable := (self instantiate: StDebuggerTreeTablePresenter)
@@ -37,13 +37,13 @@ StRawInspectionPresenter >> beForDebugger [
 		children: [ :node | #() ]
 ]
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 StRawInspectionPresenter >> selectedPageName [
 
 	^'Context'
 ]
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 StRawInspectionPresenter >> updateNodesFromScope: oldASTScope to: newASTScope [
 
 	| nodes newTemps oldTemps tempsToRemove tempsToAdd |
@@ -66,7 +66,7 @@ StRawInspectionPresenter >> updateNodesFromScope: oldASTScope to: newASTScope [
 	self attributeTable roots: nodes
 ]
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 StRawInspectionPresenter >> variableTagColumn [
 
 	^  SpLinkTableColumn new 
diff --git a/src/NewTools-Debugger/String.extension.st b/src/NewTools-Debugger/String.extension.st
index 44b3bf6a1..f0b2f8dc4 100644
--- a/src/NewTools-Debugger/String.extension.st
+++ b/src/NewTools-Debugger/String.extension.st
@@ -1,11 +1,11 @@
-Extension { #name : #String }
+Extension { #name : 'String' }
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 String >> presentDiffIn: aStFailingAssertionPresenter [
 	aStFailingAssertionPresenter initializeStringDiffPresenters
 ]
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 String >> presentDiffWith: anObject in: aStFailingAssertionPresenter [
 	anObject presentDiffIn: aStFailingAssertionPresenter
 ]
diff --git a/src/NewTools-Debugger/TStDebuggerExtension.trait.st b/src/NewTools-Debugger/TStDebuggerExtension.trait.st
index 4cb529618..13e68fe01 100644
--- a/src/NewTools-Debugger/TStDebuggerExtension.trait.st
+++ b/src/NewTools-Debugger/TStDebuggerExtension.trait.st
@@ -3,7 +3,7 @@ All Spec presenters using me will be recognised as debugger extensions when open
 
 "
 Trait {
-	#name : #TStDebuggerExtension,
+	#name : 'TStDebuggerExtension',
 	#instVars : [
 		'debugger'
 	],
@@ -11,39 +11,41 @@ Trait {
 		'showDebuggerExtension',
 		'debuggerExtensionDisplayOrder'
 	],
-	#category : #'NewTools-Debugger-Model'
+	#category : 'NewTools-Debugger-Model',
+	#package : 'NewTools-Debugger',
+	#tag : 'Model'
 }
 
-{ #category : #'debugger extension' }
+{ #category : 'debugger extension' }
 TStDebuggerExtension classSide >> defaultDisplayOrder [
 
 	^ 1
 ]
 
-{ #category : #'debugger extension' }
+{ #category : 'debugger extension' }
 TStDebuggerExtension classSide >> displayOrder [
 
 	^ debuggerExtensionDisplayOrder ifNil: [ 
 		  debuggerExtensionDisplayOrder := self defaultDisplayOrder ]
 ]
 
-{ #category : #'debugger extension' }
+{ #category : 'debugger extension' }
 TStDebuggerExtension classSide >> displayOrder: anInteger [
 	debuggerExtensionDisplayOrder := anInteger
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 TStDebuggerExtension classSide >> isOnlyForTests [
 
 	^ false
 ]
 
-{ #category : #'debugger extension' }
+{ #category : 'debugger extension' }
 TStDebuggerExtension classSide >> showInDebugger [
 	^showDebuggerExtension ifNil: [showDebuggerExtension := false]
 ]
 
-{ #category : #'debugger extension' }
+{ #category : 'debugger extension' }
 TStDebuggerExtension classSide >> showInDebugger: aBoolean [
 
 	self showInDebugger = aBoolean ifTrue: [ "The activated state hasn't changed. So we don't announce an extension toggle"
@@ -53,32 +55,32 @@ TStDebuggerExtension classSide >> showInDebugger: aBoolean [
 		(StDebuggerExtensionActivationToggle debuggerExtensionClass: self)
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 TStDebuggerExtension >> accept: aVisitor [
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 TStDebuggerExtension >> debugger [
 	^debugger
 ]
 
-{ #category : #'debugger extension' }
+{ #category : 'debugger extension' }
 TStDebuggerExtension >> debuggerExtensionToolName [
 	^self explicitRequirement 
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 TStDebuggerExtension >> debuggerLayout [
 
 	^ self defaultLayout
 ]
 
-{ #category : #'debugger extension' }
+{ #category : 'debugger extension' }
 TStDebuggerExtension >> displayOrder [
 	^self class displayOrder
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 TStDebuggerExtension >> setModelBeforeInitialization: aDebugger [
 	 debugger := aDebugger
 ]
diff --git a/src/NewTools-Debugger/TemporaryVariable.extension.st b/src/NewTools-Debugger/TemporaryVariable.extension.st
index 7fc5d60b2..30ae730da 100644
--- a/src/NewTools-Debugger/TemporaryVariable.extension.st
+++ b/src/NewTools-Debugger/TemporaryVariable.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #TemporaryVariable }
+Extension { #name : 'TemporaryVariable' }
 
-{ #category : #'*NewTools-Debugger' }
+{ #category : '*NewTools-Debugger' }
 TemporaryVariable >> variableTag [
 	^ 'temp. var'
 ]
diff --git a/src/NewTools-Debugger/package.st b/src/NewTools-Debugger/package.st
index 4a4a2aaca..dd9115f39 100644
--- a/src/NewTools-Debugger/package.st
+++ b/src/NewTools-Debugger/package.st
@@ -1 +1 @@
-Package { #name : #'NewTools-Debugger' }
+Package { #name : 'NewTools-Debugger' }