--- a/UserPreferences.st	Wed Oct 18 03:39:17 2017 +0000
+++ b/UserPreferences.st	Sat Oct 21 16:15:34 2017 +0200
@@ -3412,9 +3412,10 @@
      If syntaxColoring is turned on.
      If left nil, the normal selector color is used."
 
-    ^ self at:#collectionEnumerationSelectorColor ifAbsent:nil
+    ^ self at:#collectionEnumerationSelectorColor ifAbsent:[self selectorColor]
 
     "Created: / 14-02-2012 / 15:52:39 / cg"
+    "Modified: / 21-10-2017 / 16:14:19 / cg"
 !
 
 collectionEnumerationSelectorEmphasis
@@ -3423,9 +3424,10 @@
      If syntaxColoring is turned on.
      If left nil, the normal selector emphasis is used."
 
-    ^ self at:#collectionEnumerationSelectorEmphasis ifAbsent:nil
+    ^ self at:#collectionEnumerationSelectorEmphasis ifAbsent:[self selectorEmphasis]
 
     "Created: / 14-02-2012 / 15:58:58 / cg"
+    "Modified: / 21-10-2017 / 16:14:26 / cg"
 !
 
 commentColor
@@ -3497,18 +3499,20 @@
     "the color used for some selected controlFlow selectors (such as if, while etc.);
      If syntaxColoring is turned on."
 
-    ^ self at:#controlFlowSelectorColor ifAbsent:nil
+    ^ self at:#controlFlowSelectorColor ifAbsent:[self selectorColor]
 
     "Created: / 08-09-2006 / 15:51:20 / cg"
+    "Modified: / 21-10-2017 / 16:13:58 / cg"
 !
 
 controlFlowSelectorEmphasis
     "the emphasis used for some selected controlFlow selectors (such as if, while etc.);
      If syntaxColoring is turned on."
 
-    ^ self at:#controlFlowSelectorEmphasis ifAbsent:nil
+    ^ self at:#controlFlowSelectorEmphasis ifAbsent:[self selectorEmphasis]
 
     "Created: / 08-09-2006 / 15:51:04 / cg"
+    "Modified: / 21-10-2017 / 16:14:07 / cg"
 !
 
 debugSelectorColor
@@ -3590,7 +3594,9 @@
      If syntaxColoring is turned on.
      If left nil, the normal selector color is used."
 
-    ^ self at:#errorRaisingSelectorColor ifAbsent:nil
+    ^ self at:#errorRaisingSelectorColor ifAbsent:[self selectorColor]
+
+    "Modified: / 21-10-2017 / 16:14:43 / cg"
 !
 
 errorRaisingSelectorEmphasis
@@ -3599,7 +3605,9 @@
      If syntaxColoring is turned on.
      If left nil, the normal selector emphasis is used."
 
-    ^ self at:#errorRaisingSelectorEmphasis ifAbsent:nil
+    ^ self at:#errorRaisingSelectorEmphasis ifAbsent:[self selectorEmphasis]
+
+    "Modified: / 21-10-2017 / 16:14:37 / cg"
 !
 
 fullSelectorCheck
@@ -3970,19 +3978,31 @@
     "the color used for bad message selectors;
      If syntaxColoring is turned on."
 
-    ^ self at:#unimplementedSelectorColor ifAbsent:[UserPreferences default at:#unimplementedSelectorColor ifAbsent:[Color black]]
+    ^ self 
+        at:#unimplementedSelectorColor 
+        ifAbsent:[
+            UserPreferences default 
+                at:#unimplementedSelectorColor 
+                ifAbsent:[Color black]]
 
     "Modified: / 21-04-2011 / 12:33:29 / cg"
+    "Modified (format): / 21-10-2017 / 16:15:10 / cg"
 !
 
 unimplementedSelectorEmphasis
     "the emphasis used for bad message selectors;
      If syntaxColoring is turned on."
 
-    ^ self at:#unimplementedSelectorEmphasis ifAbsent:[UserPreferences default at:#unimplementedSelectorEmphasis ifAbsent:#normal]
+    ^ self 
+        at:#unimplementedSelectorEmphasis 
+        ifAbsent:[
+            UserPreferences default 
+                at:#unimplementedSelectorEmphasis 
+                ifAbsent:#normal]
 
     "Created: / 31-03-1998 / 15:19:09 / cg"
     "Modified: / 21-04-2011 / 12:34:36 / cg"
+    "Modified (format): / 21-10-2017 / 16:15:25 / cg"
 !
 
 unknownIdentifierColor