--- a/Tools_ClassList.st	Tue Oct 30 11:20:53 2012 +0100
+++ b/Tools_ClassList.st	Tue Oct 30 12:23:04 2012 +0100
@@ -1469,7 +1469,8 @@
                                 clr notNil ifTrue:[
                                     nm := self colorize:nm with:#color -> clr
                                 ].
-                            ] ifFalse:[
+                            ].
+                            clr isNil ifTrue:[
                                 isInChangeSet ifTrue:[
                                     nm := self emphasizeForChangedCode:nm
                                 ].
@@ -1546,39 +1547,6 @@
     "Modified: / 27-10-2012 / 12:32:20 / cg"
 !
 
-nameListIndentStringFor:aClass withNameSpace:useFullName
-    | indent indentString cls |
-
-    indent := 0.
-    indentString := ''.
-    cls := aClass superclass.
-    [self classList value includesIdentical:cls] 
-        whileTrue:
-            [indent := indent + 1.
-            cls := cls superclass].
-
-    indent == 0 ifFalse:[
-        indent <= 5 ifTrue:[
-            indentString := #(
-                         ''
-                         '  '
-                         '    '
-                         '      '
-                         '        '
-                         '          '
-                       ) at:indent+1.
-        ] ifFalse:[
-            indentString := String new:indent*2 withAll:Character space.
-        ].
-
-    ].
-    ^indentString
-
-    "Modified: / 24-02-2000 / 17:52:28 / cg"
-    "Created: / 21-01-2008 / 19:02:07 / janfrog"
-    "Modified (format): / 04-07-2011 / 18:30:20 / cg"
-!
-
 reconstructNameList
     "only reconstruct the names - class list & selection remains unschanged.
      Invoked when the organizerMode mode changes"
@@ -1961,6 +1929,39 @@
     ^ nm
 
     "Modified: / 04-07-2011 / 19:00:45 / cg"
+!
+
+nameListIndentStringFor:aClass withNameSpace:useFullName
+    | indent indentString cls |
+
+    indent := 0.
+    indentString := ''.
+    cls := aClass superclass.
+    [self classList value includesIdentical:cls] 
+        whileTrue:
+            [indent := indent + 1.
+            cls := cls superclass].
+
+    indent == 0 ifFalse:[
+        indent <= 5 ifTrue:[
+            indentString := #(
+                         ''
+                         '  '
+                         '    '
+                         '      '
+                         '        '
+                         '          '
+                       ) at:indent+1.
+        ] ifFalse:[
+            indentString := String new:indent*2 withAll:Character space.
+        ].
+
+    ].
+    ^indentString
+
+    "Modified: / 24-02-2000 / 17:52:28 / cg"
+    "Created: / 21-01-2008 / 19:02:07 / janfrog"
+    "Modified (format): / 04-07-2011 / 18:30:20 / cg"
 ! !
 
 !ClassList methodsFor:'queries'!
@@ -2012,9 +2013,9 @@
 !ClassList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.65 2012-10-30 10:08:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.66 2012-10-30 11:23:04 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.65 2012-10-30 10:08:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.66 2012-10-30 11:23:04 cg Exp $'
 ! !