diff --git a/src/BaselineOfBeautifulComments/BaselineOfBeautifulComments.class.st b/src/BaselineOfBeautifulComments/BaselineOfBeautifulComments.class.st
index 6fa060b..ce5aee3 100644
--- a/src/BaselineOfBeautifulComments/BaselineOfBeautifulComments.class.st
+++ b/src/BaselineOfBeautifulComments/BaselineOfBeautifulComments.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #BaselineOfBeautifulComments,
-	#superclass : #BaselineOf,
-	#category : #BaselineOfBeautifulComments
+	#name : 'BaselineOfBeautifulComments',
+	#superclass : 'BaselineOf',
+	#category : 'BaselineOfBeautifulComments',
+	#package : 'BaselineOfBeautifulComments'
 }
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfBeautifulComments >> baseline: spec [
 	<baseline>
 	
diff --git a/src/BaselineOfBeautifulComments/package.st b/src/BaselineOfBeautifulComments/package.st
index c32a094..40107b5 100644
--- a/src/BaselineOfBeautifulComments/package.st
+++ b/src/BaselineOfBeautifulComments/package.st
@@ -1 +1 @@
-Package { #name : #BaselineOfBeautifulComments }
+Package { #name : 'BaselineOfBeautifulComments' }
diff --git a/src/BeautifulComments/BCBeautifulCommentsSettingsTest.class.st b/src/BeautifulComments/BCBeautifulCommentsSettingsTest.class.st
index d4fba0d..3972bb0 100644
--- a/src/BeautifulComments/BCBeautifulCommentsSettingsTest.class.st
+++ b/src/BeautifulComments/BCBeautifulCommentsSettingsTest.class.st
@@ -2,15 +2,17 @@
 This class test that two settings CaptureErrors and Rendering works as intended
 "
 Class {
-	#name : #BCBeautifulCommentsSettingsTest,
-	#superclass : #TestCase,
+	#name : 'BCBeautifulCommentsSettingsTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'subject'
 	],
-	#category : #'BeautifulComments-Tests'
+	#category : 'BeautifulComments-Tests',
+	#package : 'BeautifulComments',
+	#tag : 'Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 BCBeautifulCommentsSettingsTest >> setUp [
 	super setUp.
 	
@@ -18,14 +20,14 @@ BCBeautifulCommentsSettingsTest >> setUp [
 	BCFailingOnPurposeForTestBlock failOnPurpose: true
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 BCBeautifulCommentsSettingsTest >> tearDown [
 	
 	BCFailingOnPurposeForTestBlock failOnPurpose: false.
 	super tearDown
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 BCBeautifulCommentsSettingsTest >> testErrorCatch [
 	"Chech that capture errors is working is working when true"
 	| comment capturing|
@@ -37,7 +39,7 @@ BCBeautifulCommentsSettingsTest >> testErrorCatch [
 	subject captureErrors: capturing 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 BCBeautifulCommentsSettingsTest >> testNoErrorCatch [
 	"Chech that capture errors is working is working when true"
 	| capturing|
@@ -52,7 +54,7 @@ BCBeautifulCommentsSettingsTest >> testNoErrorCatch [
 	subject captureErrors: capturing 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 BCBeautifulCommentsSettingsTest >> testNotRenderingOfMyOwnComment [
 	"Chech that rendering is working when false"
 	| comment rendering|
@@ -69,7 +71,7 @@ This class test that two settings CaptureErrors and Rendering works as intended'
 	subject rendering: rendering 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 BCBeautifulCommentsSettingsTest >> testRenderingOfMyOwnComment [
 	"Chech that rendering is working when true"
 	| comment rendering|
@@ -84,7 +86,7 @@ BCBeautifulCommentsSettingsTest >> testRenderingOfMyOwnComment [
 	subject rendering: rendering 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 BCBeautifulCommentsSettingsTest >> testThereAreTwoSettings [
 	"I am an approximation, just making sure the two class variables exist"
 	self assert: subject classVarNames equals: #(CaptureErrors Rendering)
diff --git a/src/BeautifulComments/BCFailingOnPurposeForTestBlock.class.st b/src/BeautifulComments/BCFailingOnPurposeForTestBlock.class.st
index 6ebcd47..352ada7 100644
--- a/src/BeautifulComments/BCFailingOnPurposeForTestBlock.class.st
+++ b/src/BeautifulComments/BCFailingOnPurposeForTestBlock.class.st
@@ -4,31 +4,33 @@ Toggle Edit/View comment to see how this is done.
 {!failingOnPurpose!}
 "
 Class {
-	#name : #BCFailingOnPurposeForTestBlock,
-	#superclass : #MicAnnotationBlock,
+	#name : 'BCFailingOnPurposeForTestBlock',
+	#superclass : 'MicAnnotationBlock',
 	#classVars : [
 		'FailOnPurpose'
 	],
-	#category : #'BeautifulComments-Tests'
+	#category : 'BeautifulComments-Tests',
+	#package : 'BeautifulComments',
+	#tag : 'Tests'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 BCFailingOnPurposeForTestBlock class >> failOnPurpose [
 	FailOnPurpose ifNil: [ FailOnPurpose := false ].
 	^ FailOnPurpose 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 BCFailingOnPurposeForTestBlock class >> failOnPurpose: aBoolean [
 	FailOnPurpose := aBoolean
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 BCFailingOnPurposeForTestBlock class >> tag [
 	^ #failingOnPurpose
 ]
 
-{ #category : #visiting }
+{ #category : 'visiting' }
 BCFailingOnPurposeForTestBlock >> accept: aVisitor [
 	self class failOnPurpose 
 		ifTrue: [ BCFailingOnPurposeForTestError signal ]
diff --git a/src/BeautifulComments/BCFailingOnPurposeForTestError.class.st b/src/BeautifulComments/BCFailingOnPurposeForTestError.class.st
index 9f1db3c..2c4bc26 100644
--- a/src/BeautifulComments/BCFailingOnPurposeForTestError.class.st
+++ b/src/BeautifulComments/BCFailingOnPurposeForTestError.class.st
@@ -2,7 +2,9 @@
 I am a dedicated error used to check the the CaptureErrors setting is working as intended
 "
 Class {
-	#name : #BCFailingOnPurposeForTestError,
-	#superclass : #Error,
-	#category : #'BeautifulComments-Tests'
+	#name : 'BCFailingOnPurposeForTestError',
+	#superclass : 'Error',
+	#category : 'BeautifulComments-Tests',
+	#package : 'BeautifulComments',
+	#tag : 'Tests'
 }
diff --git a/src/BeautifulComments/BeautifulComments.class.st b/src/BeautifulComments/BeautifulComments.class.st
index c6b1eeb..2890ea7 100644
--- a/src/BeautifulComments/BeautifulComments.class.st
+++ b/src/BeautifulComments/BeautifulComments.class.st
@@ -7,16 +7,18 @@ I hold preferences for the BeautifulComments (in class variables and methods on
 - As per fall of 2021 microdown and microdown support in Pharo is still in active development. Errors can occour! It is possible to set the comment to be robust to errors in the microdown in class comments. This is controlled by the `capture errors`, or through the class side method: 'captureErrors: aBoolean`.
 "
 Class {
-	#name : #BeautifulComments,
-	#superclass : #Object,
+	#name : 'BeautifulComments',
+	#superclass : 'Object',
 	#classVars : [
 		'CaptureErrors',
 		'Rendering'
 	],
-	#category : #'BeautifulComments-Core'
+	#category : 'BeautifulComments-Core',
+	#package : 'BeautifulComments',
+	#tag : 'Core'
 }
 
-{ #category : #settings }
+{ #category : 'settings' }
 BeautifulComments class >> beautifulCommentsSettingsOn: aBuilder [
 	"These settings are added to the settings defined in Microdown>>preferencesSettingsOn:"
 	<systemsettings>
@@ -34,23 +36,23 @@ BeautifulComments class >> beautifulCommentsSettingsOn: aBuilder [
 		description: self captureErrorsDocForSetting
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 BeautifulComments class >> captureErrors [
 	^ CaptureErrors ifNil: [ CaptureErrors := true ]
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 BeautifulComments class >> captureErrors: aBoolean [ 
 	CaptureErrors := aBoolean
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 BeautifulComments class >> captureErrorsDocForSetting [
 
 	^ 'By default microdown errors in comment text will not cause debugger to open. Turn this of to get debugger to open on errors'
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 BeautifulComments class >> render: aString [ 
 	"Render a string, in case of error, just return it."
 	|composer|
@@ -64,7 +66,7 @@ BeautifulComments class >> render: aString [
 			do: [ aString  ]
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 BeautifulComments class >> renderComment: aString of: aClassOrPackage [ 
 	"Return aString as part of the templated class comment, when rendering is on.
 	Else aString."
@@ -75,23 +77,23 @@ BeautifulComments class >> renderComment: aString of: aClassOrPackage [
 	^ self render: builder contents
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 BeautifulComments class >> rendering [
 	^ Rendering ifNil: [ true ]
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 BeautifulComments class >> rendering: aBoolean [
 	Rendering := aBoolean
 ]
 
-{ #category : #settings }
+{ #category : 'settings' }
 BeautifulComments class >> renderingDocForSetting [
 
 	^ 'Comments are by default rendered via microdown. When this setting is on, they are rendered as plain string (showing their Microdown definitions).'
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 BeautifulComments class >> richTextComposer [
 	^ MicRichTextComposer new
 		textStyler: BeautifulCommentsTextStyler new;
diff --git a/src/BeautifulComments/BeautifulCommentsTextStyler.class.st b/src/BeautifulComments/BeautifulCommentsTextStyler.class.st
index 74e8258..1e2b401 100644
--- a/src/BeautifulComments/BeautifulCommentsTextStyler.class.st
+++ b/src/BeautifulComments/BeautifulCommentsTextStyler.class.st
@@ -5,17 +5,19 @@ I define the parameters of rich text styling for comments. I change two things c
 - I keep newlines in paragraphs
 "
 Class {
-	#name : #BeautifulCommentsTextStyler,
-	#superclass : #MicTextStyler,
-	#category : #'BeautifulComments-UI'
+	#name : 'BeautifulCommentsTextStyler',
+	#superclass : 'MicTextStyler',
+	#category : 'BeautifulComments-UI',
+	#package : 'BeautifulComments',
+	#tag : 'UI'
 }
 
-{ #category : #public }
+{ #category : 'public' }
 BeautifulCommentsTextStyler >> headerFontSizes [
 	^ #(18 16 14 12 11 10)
 ]
 
-{ #category : #'composer styles' }
+{ #category : 'composer styles' }
 BeautifulCommentsTextStyler >> postTextTreatment: aText [
 	"See comment in superclass - keep newlines in paragraphs"
 	^ aText
diff --git a/src/BeautifulComments/ClyEditCommentSwitchMorph.class.st b/src/BeautifulComments/ClyEditCommentSwitchMorph.class.st
index 8771c4f..fda70ef 100644
--- a/src/BeautifulComments/ClyEditCommentSwitchMorph.class.st
+++ b/src/BeautifulComments/ClyEditCommentSwitchMorph.class.st
@@ -6,15 +6,17 @@ I can be activated by the keyboard shortcut defined in `ClyRichTextClassCommentE
 
 "
 Class {
-	#name : #ClyEditCommentSwitchMorph,
-	#superclass : #ClyStatusBarItemMorph,
+	#name : 'ClyEditCommentSwitchMorph',
+	#superclass : 'ClyStatusBarItemMorph',
 	#instVars : [
 		'checkbox'
 	],
-	#category : #'BeautifulComments-Core'
+	#category : 'BeautifulComments-Core',
+	#package : 'BeautifulComments',
+	#tag : 'Core'
 }
 
-{ #category : #building }
+{ #category : 'building' }
 ClyEditCommentSwitchMorph >> build [
 	
 	checkbox := CheckboxMorph 
@@ -28,18 +30,18 @@ ClyEditCommentSwitchMorph >> build [
 	self addMorph: checkbox
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ClyEditCommentSwitchMorph >> definitionTypeLabel [
 	^ 'Toggle Edit / View comment'
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 ClyEditCommentSwitchMorph >> status [
 
 	^ ownerTool isRendering
 ]
 
-{ #category : #operations }
+{ #category : 'operations' }
 ClyEditCommentSwitchMorph >> toggle [
 	ownerTool toggleMode.
 	ownerTool update
diff --git a/src/BeautifulComments/ClyPackageRichTextCommentEditorToolMorph.class.st b/src/BeautifulComments/ClyPackageRichTextCommentEditorToolMorph.class.st
index f25d8c8..5b53e2d 100644
--- a/src/BeautifulComments/ClyPackageRichTextCommentEditorToolMorph.class.st
+++ b/src/BeautifulComments/ClyPackageRichTextCommentEditorToolMorph.class.st
@@ -4,18 +4,20 @@ I am a replacement for the _package comments_ tool.
 
 "
 Class {
-	#name : #ClyPackageRichTextCommentEditorToolMorph,
-	#superclass : #ClyTextEditorToolMorph,
+	#name : 'ClyPackageRichTextCommentEditorToolMorph',
+	#superclass : 'ClyTextEditorToolMorph',
 	#traits : 'TClyRichTextCommentEditorPaneMorph',
 	#classTraits : 'TClyRichTextCommentEditorPaneMorph classTrait',
 	#instVars : [
 		'editingPackage',
 		'isRendering'
 	],
-	#category : #'BeautifulComments-Core'
+	#category : 'BeautifulComments-Core',
+	#package : 'BeautifulComments',
+	#tag : 'Core'
 }
 
-{ #category : #activation }
+{ #category : 'activation' }
 ClyPackageRichTextCommentEditorToolMorph class >> browserTabActivation [
 	"This declaration specifies that in any browser when packages are selected, a comment editor will be available in a tab."
 
@@ -23,24 +25,24 @@ ClyPackageRichTextCommentEditorToolMorph class >> browserTabActivation [
 	^ClyTabActivationStrategyAnnotation for: RPackage asCalypsoItemContext
 ]
 
-{ #category : #activation }
+{ #category : 'activation' }
 ClyPackageRichTextCommentEditorToolMorph class >> browserTabActivation2 [
 	<classAnnotation>
 	
 	^ClyTabActivationStrategyAnnotation for: ClyClassGroup asCalypsoItemContext
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 ClyPackageRichTextCommentEditorToolMorph class >> shouldBeActivatedInContext: aBrowserContext [
 	^aBrowserContext isPackageSelected and: [aBrowserContext isClassSelected not]
 ]
 
-{ #category : #activation }
+{ #category : 'activation' }
 ClyPackageRichTextCommentEditorToolMorph class >> tabOrder [
 	^ -10
 ]
 
-{ #category : #operations }
+{ #category : 'operations' }
 ClyPackageRichTextCommentEditorToolMorph >> applyChanges [
 
 	self pendingText asString = self editingText ifFalse: [
@@ -49,7 +51,7 @@ ClyPackageRichTextCommentEditorToolMorph >> applyChanges [
 	^true
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 ClyPackageRichTextCommentEditorToolMorph >> asRenderedText [
 
 	^ MicRichTextComposer new 
@@ -57,7 +59,7 @@ ClyPackageRichTextCommentEditorToolMorph >> asRenderedText [
 			of: self editingPackage
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 ClyPackageRichTextCommentEditorToolMorph >> asRenderedText: comment [
 	"Assumes we are in view source mode. commment might be an instance of RGComment. 
 	asText turns it into a Text, and asString into a string, which is what we expect. 
@@ -66,14 +68,14 @@ ClyPackageRichTextCommentEditorToolMorph >> asRenderedText: comment [
 	^ self renderComment: comment asText asString of: self editingPackage 
 ]
 
-{ #category : #controlling }
+{ #category : 'controlling' }
 ClyPackageRichTextCommentEditorToolMorph >> attachToSystem [
 
 	browser system 
 		when: (ClyPackageChange of: editingPackage) send: #triggerUpdate to: self
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ClyPackageRichTextCommentEditorToolMorph >> basicEditingText [
 
 	^ editingPackage packageManifestOrNil 
@@ -84,43 +86,43 @@ ClyPackageRichTextCommentEditorToolMorph >> basicEditingText [
 				ifFalse: [ self packageCommentBlank ] ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 ClyPackageRichTextCommentEditorToolMorph >> defaultIconName [
 	^#comments
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 ClyPackageRichTextCommentEditorToolMorph >> defaultTitle [
 	^'Comment'
 ]
 
-{ #category : #controlling }
+{ #category : 'controlling' }
 ClyPackageRichTextCommentEditorToolMorph >> detachFromSystem [
 
 	browser system unsubscribe: self
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 ClyPackageRichTextCommentEditorToolMorph >> disable [
 	textMorph enabled: false
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ClyPackageRichTextCommentEditorToolMorph >> editingPackage [
 	^ editingPackage
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ClyPackageRichTextCommentEditorToolMorph >> editingPackage: anObject [
 	editingPackage := anObject
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 ClyPackageRichTextCommentEditorToolMorph >> enable [
 	textMorph enabled: true
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 ClyPackageRichTextCommentEditorToolMorph >> fillStatusBar [
 
 	super fillStatusBar.
@@ -129,21 +131,21 @@ ClyPackageRichTextCommentEditorToolMorph >> fillStatusBar [
 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 ClyPackageRichTextCommentEditorToolMorph >> initialize [
 	super initialize.
 	self initializePaneTrait.
 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 ClyPackageRichTextCommentEditorToolMorph >> isSimilarTo: anotherBrowserTool [
 	(super isSimilarTo: anotherBrowserTool) ifFalse: [ ^false ].
 	
 	^editingPackage = anotherBrowserTool editingPackage
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 ClyPackageRichTextCommentEditorToolMorph >> isValidInContext: aClyFullBrowserContext [
 	
 	self context class = aClyFullBrowserContext class 
@@ -154,32 +156,32 @@ ClyPackageRichTextCommentEditorToolMorph >> isValidInContext: aClyFullBrowserCon
 		ifFalse: [ false ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ClyPackageRichTextCommentEditorToolMorph >> packageCommentBlank [
 
 	^'Please comment package here'
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 ClyPackageRichTextCommentEditorToolMorph >> printContext [
 	^editingPackage name
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 ClyPackageRichTextCommentEditorToolMorph >> setBackgroundColor: aColor [
 
 	textMorph color: aColor
 	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 ClyPackageRichTextCommentEditorToolMorph >> setUpModelFromContext [
 	super setUpModelFromContext.
 
 	editingPackage := context lastSelectedPackage
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 ClyPackageRichTextCommentEditorToolMorph >> wantsTextStyling [
 	^false
 ]
diff --git a/src/BeautifulComments/ClyRichTextClassCommentEditorToolMorph.class.st b/src/BeautifulComments/ClyRichTextClassCommentEditorToolMorph.class.st
index bc92d6d..dc1bb8d 100644
--- a/src/BeautifulComments/ClyRichTextClassCommentEditorToolMorph.class.st
+++ b/src/BeautifulComments/ClyRichTextClassCommentEditorToolMorph.class.st
@@ -4,24 +4,26 @@ I am a replacement tool for **class** comments.
 I need to be refactored somehow as `ClyPackageRichTextCommentEditorToolMorph` and `ClyRichTextClassCommentEditorToolMorph` are basically identical
 "
 Class {
-	#name : #ClyRichTextClassCommentEditorToolMorph,
-	#superclass : #ClyClassEditorToolMorph,
+	#name : 'ClyRichTextClassCommentEditorToolMorph',
+	#superclass : 'ClyClassEditorToolMorph',
 	#traits : 'TClyRichTextCommentEditorPaneMorph',
 	#classTraits : 'TClyRichTextCommentEditorPaneMorph classTrait',
 	#instVars : [
 		'isRendering'
 	],
-	#category : #'BeautifulComments-UI'
+	#category : 'BeautifulComments-UI',
+	#package : 'BeautifulComments',
+	#tag : 'UI'
 }
 
-{ #category : #activation }
+{ #category : 'activation' }
 ClyRichTextClassCommentEditorToolMorph class >> classCommentTabActivation [
 	<classAnnotation>
 	
 	^ClyTabActivationStrategyAnnotation for: ClyClassComment asCalypsoItemContext
 ]
 
-{ #category : #operations }
+{ #category : 'operations' }
 ClyRichTextClassCommentEditorToolMorph >> applyChanges [
 
 	self pendingText asString = self editingText asString 
@@ -32,7 +34,7 @@ ClyRichTextClassCommentEditorToolMorph >> applyChanges [
 	^true
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 ClyRichTextClassCommentEditorToolMorph >> asRenderedText: comment [
 	"Assumes we are in view source mode. commment might be an instance of RGComment. 
 	asText turns it into a Text, and asString into a string, which is what we expect. 
@@ -41,40 +43,40 @@ ClyRichTextClassCommentEditorToolMorph >> asRenderedText: comment [
 	^ self renderComment: comment asText asString of: self editingClass 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ClyRichTextClassCommentEditorToolMorph >> basicEditingText [
 
 	^ editingClass comment
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 ClyRichTextClassCommentEditorToolMorph >> defaultIconName [
 	^(context lastSelectedItem isMarkedWith: ClyNoCommentTag)
 		ifTrue: [ #uncommentedClass ]
 		ifFalse: [ #comments]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 ClyRichTextClassCommentEditorToolMorph >> defaultTitle [
 	^'Comment'
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 ClyRichTextClassCommentEditorToolMorph >> disable [
 	textMorph enabled: false
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ClyRichTextClassCommentEditorToolMorph >> editingMode [
 	^ RubSmalltalkCommentMode new
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 ClyRichTextClassCommentEditorToolMorph >> enable [
 	textMorph enabled: true
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 ClyRichTextClassCommentEditorToolMorph >> fillStatusBar [
 
 	super fillStatusBar.
@@ -83,26 +85,26 @@ ClyRichTextClassCommentEditorToolMorph >> fillStatusBar [
 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 ClyRichTextClassCommentEditorToolMorph >> initialize [
 
 	super initialize.
 	self initializePaneTrait
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 ClyRichTextClassCommentEditorToolMorph >> printContext [
 	^super printContext , ' / ', editingClass name
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 ClyRichTextClassCommentEditorToolMorph >> setBackgroundColor: aColor [
 	
 	textMorph color: aColor
 	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 ClyRichTextClassCommentEditorToolMorph >> setUpDefaultIcon [
 	"Here we duplicate logic of #defaultIconName to directly ask class about comment.
 	This method is called during background tab building. 
@@ -113,7 +115,7 @@ ClyRichTextClassCommentEditorToolMorph >> setUpDefaultIcon [
 	containerTab icon: (self iconNamed: iconName)
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 ClyRichTextClassCommentEditorToolMorph >> wantsTextStyling [
 	^false
 ]
diff --git a/src/BeautifulComments/ClySyntaxHelpMorph.class.st b/src/BeautifulComments/ClySyntaxHelpMorph.class.st
index 9c71ac9..d28bbaa 100644
--- a/src/BeautifulComments/ClySyntaxHelpMorph.class.st
+++ b/src/BeautifulComments/ClySyntaxHelpMorph.class.st
@@ -6,15 +6,17 @@ I implement the `Syntax help` button in the lower right of this pane:
 
 "
 Class {
-	#name : #ClySyntaxHelpMorph,
-	#superclass : #ClyStatusBarItemMorph,
+	#name : 'ClySyntaxHelpMorph',
+	#superclass : 'ClyStatusBarItemMorph',
 	#instVars : [
 		'button'
 	],
-	#category : #'BeautifulComments-Core'
+	#category : 'BeautifulComments-Core',
+	#package : 'BeautifulComments',
+	#tag : 'Core'
 }
 
-{ #category : #building }
+{ #category : 'building' }
 ClySyntaxHelpMorph >> action [
 
 	| window text | 
@@ -26,7 +28,7 @@ ClySyntaxHelpMorph >> action [
 	window openInWorld
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 ClySyntaxHelpMorph >> build [
 	
 	button := PluggableButtonMorph
@@ -38,7 +40,7 @@ ClySyntaxHelpMorph >> build [
 	self addMorph: button
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 ClySyntaxHelpMorph >> buildText [ 
  
 	| textModel scrolledText |
@@ -51,12 +53,12 @@ ClySyntaxHelpMorph >> buildText [
 	^ scrolledText
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ClySyntaxHelpMorph >> label [
 	^ 'Syntax Help'
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 ClySyntaxHelpMorph >> rawMicrodownSyntax [
 
 	^ '
@@ -92,7 +94,7 @@ You can edit this file clicking on `ClySyntaxHelpMorph>>#rawMicrodownSyntax`.
 '
 ]
 
-{ #category : #building }
+{ #category : 'building' }
 ClySyntaxHelpMorph >> syntax [ 
 	"Return a text to be rendered by a morph, and produced by the MicRichTextComposer"
 	
diff --git a/src/BeautifulComments/TClyRichTextCommentEditorPaneMorph.trait.st b/src/BeautifulComments/TClyRichTextCommentEditorPaneMorph.trait.st
index a8a2f50..2297f9d 100644
--- a/src/BeautifulComments/TClyRichTextCommentEditorPaneMorph.trait.st
+++ b/src/BeautifulComments/TClyRichTextCommentEditorPaneMorph.trait.st
@@ -2,14 +2,16 @@
 I am a trait that gathers the common aspects of the package and class comment editors.
 "
 Trait {
-	#name : #TClyRichTextCommentEditorPaneMorph,
+	#name : 'TClyRichTextCommentEditorPaneMorph',
 	#instVars : [
 		'isRendering'
 	],
-	#category : #'BeautifulComments-Core'
+	#category : 'BeautifulComments-Core',
+	#package : 'BeautifulComments',
+	#tag : 'Core'
 }
 
-{ #category : #'trait rendering' }
+{ #category : 'trait rendering' }
 TClyRichTextCommentEditorPaneMorph >> buildTextMorph [
 	super buildTextMorph.
 	self setBackgroundColor: self renderColor.
@@ -17,12 +19,12 @@ TClyRichTextCommentEditorPaneMorph >> buildTextMorph [
 	self disable 
 ]
 
-{ #category : #'class initialization' }
+{ #category : 'class initialization' }
 TClyRichTextCommentEditorPaneMorph >> captureErrors [ 
 	^ BeautifulComments captureErrors 
 ]
 
-{ #category : #'trait rendering' }
+{ #category : 'trait rendering' }
 TClyRichTextCommentEditorPaneMorph >> changesAccepted [
 	| res |
 	res := super changesAccepted.
@@ -30,12 +32,12 @@ TClyRichTextCommentEditorPaneMorph >> changesAccepted [
 	^res
 ]
 
-{ #category : #'trait rendering' }
+{ #category : 'trait rendering' }
 TClyRichTextCommentEditorPaneMorph >> editColor [
 	^ self theme backgroundColor 
 ]
 
-{ #category : #'trait rendering' }
+{ #category : 'trait rendering' }
 TClyRichTextCommentEditorPaneMorph >> editingText [
 	| text |
 	text := self basicEditingText.
@@ -44,19 +46,19 @@ TClyRichTextCommentEditorPaneMorph >> editingText [
 		ifFalse: [ text ]
 ]
 
-{ #category : #'trait rendering' }
+{ #category : 'trait rendering' }
 TClyRichTextCommentEditorPaneMorph >> initializePaneTrait [ 
 	isRendering := true.
 
 ]
 
-{ #category : #'trait rendering' }
+{ #category : 'trait rendering' }
 TClyRichTextCommentEditorPaneMorph >> isRendering [
 
 	^ isRendering
 ]
 
-{ #category : #'trait rendering' }
+{ #category : 'trait rendering' }
 TClyRichTextCommentEditorPaneMorph >> renderColor [
 	| bgColor |
 	bgColor := self theme backgroundColor.
@@ -65,14 +67,14 @@ TClyRichTextCommentEditorPaneMorph >> renderColor [
 		ifFalse: [ bgColor darker ]
 ]
 
-{ #category : #rendering }
+{ #category : 'rendering' }
 TClyRichTextCommentEditorPaneMorph >> renderComment: aString of: aClassOrPackage [ 
 	"The actual implementation is moved to BeautifulComments - basically to allow Testing"
 	
 	^ BeautifulComments renderComment: aString of: aClassOrPackage
 ]
 
-{ #category : #'trait rendering' }
+{ #category : 'trait rendering' }
 TClyRichTextCommentEditorPaneMorph >> switchToEditMode [
 	isRendering := false.
 	self enable.
@@ -80,7 +82,7 @@ TClyRichTextCommentEditorPaneMorph >> switchToEditMode [
 	self triggerUpdate
 ]
 
-{ #category : #'trait rendering' }
+{ #category : 'trait rendering' }
 TClyRichTextCommentEditorPaneMorph >> switchToRenderMode [
 	self hasUnacceptedEdits
 		ifTrue: [ ^ self ].
@@ -90,7 +92,7 @@ TClyRichTextCommentEditorPaneMorph >> switchToRenderMode [
 	self triggerUpdate
 ]
 
-{ #category : #'trait rendering' }
+{ #category : 'trait rendering' }
 TClyRichTextCommentEditorPaneMorph >> toggleMode [
 	isRendering
 		ifTrue: [ self switchToEditMode ]
diff --git a/src/BeautifulComments/package.st b/src/BeautifulComments/package.st
index 61dbd91..fe3a853 100644
--- a/src/BeautifulComments/package.st
+++ b/src/BeautifulComments/package.st
@@ -1 +1 @@
-Package { #name : #BeautifulComments }
+Package { #name : 'BeautifulComments' }