--- a/UILayoutTool.st	Thu Oct 29 01:17:18 2015 +0100
+++ b/UILayoutTool.st	Thu Oct 29 09:31:25 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1995 by eXept Software AG
               All Rights Reserved
@@ -1415,7 +1417,7 @@
     "
     |layout|
 
-    layout  := Smalltalk::AlignmentOrigin new.
+    layout  := (Smalltalk at:#AlignmentOrigin) new.
 
     layout 
         leftFraction:(((self aspectFor:#leftFraction) value) ? 0)
@@ -3048,7 +3050,7 @@
     "
     |layout|
 
-    layout  := Smalltalk::LayoutFrame new.
+    layout  := (Smalltalk at:LayoutFrame) new.
 
     layout 
         leftFraction:(((self aspectFor:#leftFraction)   value) ? 0)
@@ -3285,7 +3287,7 @@
     "
     |layout|
 
-    layout  := Smalltalk::LayoutOrigin new.
+    layout  := (Smalltalk at:#LayoutOrigin) new.
 
     layout 
         leftFraction:(((self aspectFor:#leftFraction) value) ? 0)
@@ -3356,9 +3358,9 @@
 layout
     "returns current layout as point
     "
-  ^ Smalltalk::Point x:(((self aspectFor:#leftOffset) value) ? 0)
-                     y:(((self aspectFor:#topOffset)  value) ? 0)
-
+  ^ (((self aspectFor:#leftOffset) value) ? 0) 
+    @ 
+    (((self aspectFor:#topOffset)  value) ? 0)
 ! !
 
 !UILayoutTool::Rectangle class methodsFor:'interface specs'!
@@ -3477,7 +3479,7 @@
 layout
     "returns current layout as rectangle"
 
-    ^ Smalltalk::Rectangle 
+    ^ (Smalltalk at:#Rectangle) 
         left:(((self aspectFor:#leftOffset)   value) ? 0)
         top:(((self aspectFor:#topOffset)    value) ? 0)
         right:(((self aspectFor:#rightOffset)  value) ? 0)