--- a/NewLauncher.st	Thu Sep 03 11:47:32 2015 +0200
+++ b/NewLauncher.st	Thu Sep 03 11:48:33 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1997-1998 by eXept Software AG
 	      All Rights Reserved
@@ -3924,7 +3926,7 @@
                                         package notNil ifTrue:[
                                             dir := Smalltalk packageDirectoryForPackageId:package.
                                             dir notNil ifTrue:[
-                                                UserPreferences current fileBrowserClass openOn:dir.
+                                                FileBrowser default openOn:dir.
                                             ] ifFalse:[
                                                 Dialog warn:(resources string:'Directory not present/readable: "%1"' with:dir)
                                             ]
@@ -3936,7 +3938,7 @@
                                 itemValue: 
                                     [
                                         defClass notNil ifTrue:[
-                                            UserPreferences current systemBrowserClass openInClass:defClass class
+                                            SystemBrowser default openInClass:defClass class
                                         ].
                                     ]
                                 enabled:defClass notNil).
@@ -5384,8 +5386,7 @@
 findApplicationAndOpen
     |cls|
 
-    cls := UserPreferences current systemBrowserClass 
-                askForClassWithFilter:[:cls | cls isVisualStartable].
+    cls := SystemBrowser default askForClassWithFilter:[:cls | cls isVisualStartable].
     cls notNil ifTrue:[
         cls open
     ]
@@ -5394,10 +5395,9 @@
 findClassAndBrowse
     |cls|
 
-    cls := UserPreferences current systemBrowserClass askForClass.
+    cls := SystemBrowser default askForClass.
     cls notNil ifTrue:[
-        UserPreferences current systemBrowserClass 
-            openInClass:cls selector:nil
+        SystemBrowser default openInClass:cls selector:nil
     ]
 !