diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,26 @@
 
+0.8.0 to 0.9.0:
+
+  * Stopped re-exporting @DrawingContext@ from Wumpus-Basic in 
+    the module Wumpus.Tree. Clients must now import 
+    @Wumpus.Basic.Graphic@ to get the @DrawingContext@ type and 
+    the constructor @StandardContext@.
+
+  * Internal changes to track updates to Wumpus-Basic.
+ 
+0.7.0 to 0.8.0:
+
+  * Changed drawTreePicture to use the @ScalingContext@ datatype
+    from Wumpus.Basic. The type @ScaleFactors@ is now a type
+    synonym for @SalingContext@ operation on all Doubles. 
+ 
+  * Added an alternative drawing style /family tree/.
+ 
+0.6.0 to 0.7.0:
+ 
+  * More example trees in Demo01.hs.
+
+  * Updated to track changes in Wumpus-Basic.
 
 0.5.0 to 0.6.0:
  
diff --git a/demo/Demo01.hs b/demo/Demo01.hs
--- a/demo/Demo01.hs
+++ b/demo/Demo01.hs
@@ -6,6 +6,7 @@
 import Wumpus.Tree
 
 import Wumpus.Basic.Colour.SVGColours           -- package: wumpus-basic
+import Wumpus.Basic.Graphic
 
 import Data.Tree hiding ( drawTree )
 import System.Directory
diff --git a/src/Wumpus/Tree.hs b/src/Wumpus/Tree.hs
--- a/src/Wumpus/Tree.hs
+++ b/src/Wumpus/Tree.hs
@@ -17,12 +17,6 @@
   -- * The type of rendered trees
     TreePicture
 
-
-  -- * Render a Data.Tree to a TreePicture
-  , DrawingContext(..)                  -- re-export
-  , standardContext                     -- re-export
-
-
   , ScaleFactors
   , uniformScaling
   , scaleFactors
@@ -157,7 +151,7 @@
 -- Suitable for printing the shape of a tree, ignoring the data.
 --
 circleNode :: RGBi -> (a -> TreeNode)
-circleNode rgb = \_ pt -> localDF (primaryColour rgb) (dotCircle pt)
+circleNode rgb = \_ pt -> localize (strokeColour rgb) (dotCircle pt)
 
 
 -- | Tree nodes with a filled circle.
@@ -165,7 +159,7 @@
 -- Suitable for printing the shape of a tree, ignoring the data.
 --
 diskNode :: RGBi -> (a -> TreeNode)
-diskNode rgb = \_ pt -> localDF (secondaryColour rgb) (dotDisk pt)
+diskNode rgb = \_ pt -> localize (fillColour rgb) (dotDisk pt)
 
 
 
diff --git a/src/Wumpus/Tree/VersionNumber.hs b/src/Wumpus/Tree/VersionNumber.hs
--- a/src/Wumpus/Tree/VersionNumber.hs
+++ b/src/Wumpus/Tree/VersionNumber.hs
@@ -22,7 +22,7 @@
 
 -- | Version number
 --
--- > (0,8,0)
+-- > (0,9,0)
 --
 wumpus_tree_version :: (Int,Int,Int)
-wumpus_tree_version = (0,8,0)
+wumpus_tree_version = (0,9,0)
diff --git a/wumpus-tree.cabal b/wumpus-tree.cabal
--- a/wumpus-tree.cabal
+++ b/wumpus-tree.cabal
@@ -1,5 +1,5 @@
 name:             wumpus-tree
-version:          0.8.0
+version:          0.9.0
 license:          BSD3
 license-file:     LICENSE
 copyright:        Stephen Tetley <stephen.tetley@gmail.com>
@@ -18,21 +18,16 @@
   \*\* WARNING \*\* - the API is unstable and will change. 
   .
   Changelog:
-  . 
-  0.7.0 to 0.8.0:
   .
-  * Changed drawTreePicture to use the @ScalingContext@ datatype
-    from Wumpus.Basic. The type @ScaleFactors@ is now a type
-    synonym for @SalingContext@ operation on all Doubles. 
-  . 
-  * Added an alternative drawing style /family tree/.
-  . 
-  0.6.0 to 0.7.0:
-  . 
-  * More example trees in Demo01.hs.
+  0.8.0 to 0.9.0:
   .
-  * Updated to track changes in Wumpus-Basic.
+  * Stopped re-exporting @DrawingContext@ from Wumpus-Basic in 
+    the module Wumpus.Tree. Clients must now import 
+    @Wumpus.Basic.Graphic@ to get the @DrawingContext@ type and 
+    the constructor @StandardContext@.
   .
+  * Internal changes to track updates to Wumpus-Basic.
+  . 
   .
 build-type:         Simple
 stability:          highly unstable
@@ -48,18 +43,18 @@
   build-depends:      base              <  5, 
                       containers        >= 0.3.0     && < 0.4.0,
                       vector-space      >= 0.6,
-                      wumpus-core       == 0.34.0,
-                      wumpus-basic      == 0.9.0
+                      wumpus-core       == 0.35.0,
+                      wumpus-basic      == 0.10.0
 
   
   exposed-modules:
     Wumpus.Tree,
+    Wumpus.Tree.Base,
+    Wumpus.Tree.Design,
+    Wumpus.Tree.Draw,
     Wumpus.Tree.VersionNumber
 
   other-modules:
-    Wumpus.Tree.Base,
-    Wumpus.Tree.Design,
-    Wumpus.Tree.Draw
 
   extensions: