--- a/smalltalk.rc	Wed Dec 01 17:32:54 1999 +0100
+++ b/smalltalk.rc	Wed Dec 01 23:17:25 1999 +0100
@@ -1,7 +1,8 @@
-"/ MIMEType: application/x-smalltalk-source
 "/
 "/ $Header$
 "/
+"/ MIMEType: application/x-smalltalk-source
+"/
 "/ ST/X startup configuration & command file:
 "/
 "/ startup configuration for smalltalk
@@ -417,13 +418,20 @@
 Smalltalk isStandAloneApp ifFalse:[
     anyWrong := false.
     missing := ''.
-    (Smalltalk getSystemFileName:'resources/SystemBrowser.rs') isNil ifTrue:[
+    (Smalltalk getResourceFileName:'SystemBrowser.rs' forClass:SystemBrowser) isNil ifTrue:[
 	'***********************************************************************' errorPrintCR.
 	'***** ATTENTION: please check installation of your >>resource<< files' errorPrintCR.
 	'***** I will not be able to give non-english messages' errorPrintCR.
 	anyWrong := true.
 	missing := '''resources'' '.
     ].
+    (Smalltalk getResourceFileName:'normal.style' forClass:View) isNil ifTrue:[
+	'***********************************************************************' errorPrintCR.
+	'***** ATTENTION: please check installation of your >>style<< files' errorPrintCR.
+	'***** I will use a plain b&w viewStyle as a fallBack' errorPrintCR.
+	anyWrong := true.
+	missing := missing , '''resources'' '.
+    ].
     (Smalltalk getSystemFileName:'source/Object.st') isNil ifTrue:[
       (Smalltalk getSystemFileName:'source/source.zip') isNil ifTrue:[
 	(Smalltalk getSystemFileName:'source/libbasic.zip') isNil ifTrue:[
@@ -444,19 +452,13 @@
 	]
       ]
     ].
-    (Smalltalk getSystemFileName:'bitmaps/SBrowser.xbm') isNil ifTrue:[
+    ((Smalltalk getSystemFileName:'bitmaps/SBrowser.xbm') isNil 
+    and:[(Smalltalk getSystemFileName:'packages/libtool/bitmaps/SBrowser.xbm') isNil]) ifTrue:[
 	'***********************************************************************' errorPrintCR.
 	'***** ATTENTION: please check installation of your >>bitmap<< files' errorPrintCR.
 	anyWrong := true.
 	missing := missing , '''bitmaps'' '.
     ].
-    (Smalltalk getSystemFileName:'resources/normal.style') isNil ifTrue:[
-	'***********************************************************************' errorPrintCR.
-	'***** ATTENTION: please check installation of your >>style<< files' errorPrintCR.
-	'***** I will use a plain b&w viewStyle as a fallBack' errorPrintCR.
-	anyWrong := true.
-	missing := missing , '''resources'' '.
-    ].
 
     anyWrong ifTrue:[
 	'*****' errorPrintCR.