diff --git a/basis/ui/tools/common/common.factor b/basis/ui/tools/common/common.factor
index 898e25252d..97becdfb5b 100644
--- a/basis/ui/tools/common/common.factor
+++ b/basis/ui/tools/common/common.factor
@@ -1,20 +1,15 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs classes classes.mixin kernel namespaces
-parser ui.gadgets ui.gadgets.borders
-ui.pens.solid ui.gadgets.scrollers ui.gadgets.tracks ui.theme
-combinators.short-circuit ;
+USING: accessors classes combinators.short-circuit kernel ui.gadgets
+ui.gadgets.borders ui.gadgets.scrollers ui.gadgets.tracks
+ui.pens.solid ui.theme words ;
 IN: ui.tools.common
 
-SYMBOL: tool-dims
-
-tool-dims [ H{ } clone ] initialize
-
-: set-tool-dim ( dim class -- )
-    tool-dims get-global set-at ;
+: set-tool-dim ( class dim -- )
+    "tool-dim" set-word-prop ;
 
 : get-tool-dim ( class -- dim )
-    tool-dims get-global at ;
+    "tool-dim" word-prop ;
 
 TUPLE: tool < track ;
 
@@ -23,7 +18,7 @@ M: tool pref-dim*
 
 M: tool layout*
     [ call-next-method ]
-    [ [ dim>> ] [ class-of ] bi set-tool-dim ]
+    [ [ class-of ] [ dim>> ] bi set-tool-dim ]
     bi ;
 
 SLOT: scroller
@@ -40,7 +35,7 @@ SLOT: scroller
 : com-scroll-down ( tool -- )
     scroller>> scroll-down-line ;
 
-: margins ( child -- border ) 
+: margins ( child -- border )
     { 9 9 } <filled-border> ;
 
 : with-lines ( track -- track )