--- a/Tools__FontSettingsApplication.st	Wed Jan 27 20:18:58 2016 +0100
+++ b/Tools__FontSettingsApplication.st	Tue Feb 02 18:48:02 2016 +0100
@@ -969,13 +969,13 @@
 changeToSTXLookXft
     |fixFont variableFont|
 
-    Screen current supportsXFTFonts ifFalse:[
+    self hasXftFonts ifFalse:[
         self changeToSTXLook.
         ^ self.
     ].
 
-    fixFont := (XftFontDescription family:'Courier' face:'regular' style:'roman' size:(TextView defaultFont size)).
-    variableFont := (XftFontDescription family:'Arial' face:'regular' style:'roman' size:(TextView defaultFont size)).
+    fixFont := XftFontDescription family:'Courier' face:'regular' style:'roman' size:(TextView defaultFont size).
+    variableFont := XftFontDescription family:'Arial' face:'regular' style:'roman' size:(TextView defaultFont size).
     self changeToFix:fixFont variable:variableFont.
 !
 
@@ -996,15 +996,15 @@
 
     |fixFont variableFont|
 
-    Screen current supportsXFTFonts ifFalse:[
+    self hasXftFonts ifFalse:[
         ^ self.
     ].
 
     TextView defaultFont:(XftFontDescription family:'Courier' face:'regular' style:'roman' size:(TextView defaultFont size)).
     Label defaultFont:(XftFontDescription family:'Arial' face:'regular' style:'roman' size:(Label defaultFont size)).
     
-    fixFont := (XftFontDescription family:'Courier' face:'regular' style:'roman' size:(TextView defaultFont size)).
-    variableFont := (XftFontDescription family:'Arial' face:'regular' style:'roman' size:(TextView defaultFont size)).
+    fixFont := XftFontDescription family:'Courier' face:'regular' style:'roman' size:(TextView defaultFont size).
+    variableFont := XftFontDescription family:'Arial' face:'regular' style:'roman' size:(TextView defaultFont size).
     self changeToFix:fixFont variable:variableFont.
 !
 
@@ -1433,7 +1433,7 @@
 !
 
 hasXftFonts
-    ^ Screen current supportsXFTFonts
+    ^ self graphicsDevice supportsXftFonts
 ! !
 
 !FontSettingsApplication class methodsFor:'documentation'!