--- a/SelectionInListView.st	Thu Apr 21 06:44:55 2016 +0200
+++ b/SelectionInListView.st	Fri Apr 22 06:42:13 2016 +0200
@@ -2947,18 +2947,14 @@
         halfIntensityFgColor := Color darkGray.
     ].
 
+    hilightFgColorNoFocus := DefaultHilightForegroundColorNoFocus.
     hilightFgColorNoFocus isNil ifTrue:[
-        hilightFgColorNoFocus := DefaultHilightForegroundColorNoFocus.
-        hilightFgColorNoFocus isNil ifTrue:[
-            hilightFgColorNoFocus := hilightFgColor slightlyLightened.
-        ]
+        hilightFgColorNoFocus := hilightFgColor slightlyLightened.
     ].
+    hilightBgColorNoFocus := DefaultHilightBackgroundColorNoFocus.
     hilightBgColorNoFocus isNil ifTrue:[
-        hilightBgColorNoFocus := DefaultHilightBackgroundColorNoFocus.
-        hilightBgColorNoFocus isNil ifTrue:[
-            hilightBgColorNoFocus := hilightBgColor slightlyLightened.
-        ]
-    ].
+        hilightBgColorNoFocus := hilightBgColor slightlyLightened.
+    ]
 
     "Modified: / 05-08-1998 / 00:00:00 / cg"
     "Modified (comment): / 05-10-2011 / 15:50:50 / az"

--- a/TextView.st	Thu Apr 21 06:44:55 2016 +0200
+++ b/TextView.st	Fri Apr 22 06:42:13 2016 +0200
@@ -2025,7 +2025,7 @@
 changeFont
     "pop up a fontPanel to change font"
 
-    |newFont fp|
+    |newFont fp userPrefs fontPrefs newFontPrefs|
 
     self withWaitCursorDo:[
         fp := FontPanel new.
@@ -2037,10 +2037,14 @@
         fp changeFontInAllViews ifTrue:[
             "/ user checked this box - change the defaults,
             "/ and update all other textviews now.
-
+            userPrefs := UserPreferences current.
+            fontPrefs := userPrefs fontPreferences.
+            fontPrefs isNil ifTrue:[ fontPrefs := newFontPrefs := Dictionary new ].
+            
             TextView defaultFont:newFont.
-            UserPreferences current fontPreferences
-                at:#Text put:(newFont storeString).
+            fontPrefs at:#Text put:(newFont storeString).
+            newFontPrefs notNil ifTrue:[ userPrefs fontPreferences:newFontPrefs ].
+            userPrefs beModified.
             DebugView newDebugger.
             TextView allSubInstances do:[:v |
                 v font:newFont