diff --git a/compdata.cabal b/compdata.cabal
--- a/compdata.cabal
+++ b/compdata.cabal
@@ -1,5 +1,5 @@
 Name:			compdata
-Version:		0.10.1
+Version:		0.11
 Synopsis:            	Compositional Data Types
 Description:
 
@@ -188,7 +188,7 @@
                         Data.Comp.Multi.Derive.SmartAConstructors
 
   Build-Depends:	base >= 4.7, base < 5, template-haskell, containers, mtl >= 2.2.1, QuickCheck >= 2 && < 2.9, derive,
-                        deepseq, th-expand-syns, transformers, tree-view
+                        deepseq, th-expand-syns, transformers, tree-view >= 0.5
   Extensions:           FlexibleContexts
   hs-source-dirs:	src
   ghc-options:          -W
diff --git a/examples/Examples/Common.hs b/examples/Examples/Common.hs
--- a/examples/Examples/Common.hs
+++ b/examples/Examples/Common.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE TemplateHaskell, TypeOperators #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE DeriveFunctor #-}
 --------------------------------------------------------------------------------
 -- |
 -- Module      :  Examples.Common
@@ -22,12 +23,14 @@
 
 -- Signature for values and operators
 data Value a = Const Int | Pair a a
+  deriving Functor
 data Op a    = Add a a | Mult a a | Fst a | Snd a
+  deriving Functor
 
 -- Signature for the simple expression language
 type Sig = Op :+: Value
 
 -- Derive boilerplate code using Template Haskell
-$(derive [makeFunctor, makeTraversable, makeFoldable,
+$(derive [makeTraversable, makeFoldable,
           makeEqF, makeShowF, smartConstructors, smartAConstructors]
          [''Value, ''Op])
diff --git a/examples/Examples/Desugar.hs b/examples/Examples/Desugar.hs
--- a/examples/Examples/Desugar.hs
+++ b/examples/Examples/Desugar.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE TemplateHaskell, TypeOperators, MultiParamTypeClasses,
   FlexibleInstances, FlexibleContexts, UndecidableInstances,
   OverlappingInstances, ConstraintKinds #-}
+{-# LANGUAGE DeriveFunctor #-}
 --------------------------------------------------------------------------------
 -- |
 -- Module      :  Examples.Desugar
@@ -31,6 +32,7 @@
 
 -- Signature for syntactic sugar
 data Sugar a = Neg a | Swap a
+  deriving Functor
 
 -- Source position information (line number, column number)
 data Pos = Pos Int Int
@@ -47,7 +49,7 @@
 type SigP' = Sugar :&: Pos :+: Op :&: Pos :+: Value :&: Pos
 
 -- Derive boilerplate code using Template Haskell
-$(derive [makeFunctor, makeTraversable, makeFoldable,
+$(derive [makeTraversable, makeFoldable,
           makeEqF, makeShowF, makeOrdF, smartConstructors, smartAConstructors]
          [''Sugar])
 
diff --git a/src/Data/Comp/Derive.hs b/src/Data/Comp/Derive.hs
--- a/src/Data/Comp/Derive.hs
+++ b/src/Data/Comp/Derive.hs
@@ -25,9 +25,6 @@
      module Data.Comp.Derive.Equality,
      -- ** OrdF
      module Data.Comp.Derive.Ordering,
-     -- ** Functor
-     Functor,
-     makeFunctor,
      -- ** Foldable
      module Data.Comp.Derive.Foldable,
      -- ** Traversable
@@ -66,11 +63,6 @@
 
 import qualified Data.Derive.All as A
 import qualified Data.DeriveTH as D
-
-{-| Derive an instance of 'Functor' for a type constructor of any first-order
-  kind taking at least one argument. -}
-makeFunctor :: Name -> Q [Dec]
-makeFunctor = D.derive A.makeFunctor
 
 {-| Derive an instance of 'NFData' for a type constructor. -}
 makeNFData :: Name -> Q [Dec]
diff --git a/src/Data/Comp/Render.hs b/src/Data/Comp/Render.hs
--- a/src/Data/Comp/Render.hs
+++ b/src/Data/Comp/Render.hs
@@ -29,6 +29,8 @@
 
 -- | Write a term to an HTML file with foldable nodes
 writeHtmlTerm :: Render f => FilePath -> Term f -> IO ()
-writeHtmlTerm file = writeHtmlTree file . fmap (\n -> NodeInfo n "") . stringTree
+writeHtmlTerm file
+    = writeHtmlTree Nothing file
+    . fmap (\n -> NodeInfo InitiallyExpanded n "") . stringTree
 
 $(derive [liftSum] [''Render])
diff --git a/testsuite/tests/Data/Comp/Variables_Test.hs b/testsuite/tests/Data/Comp/Variables_Test.hs
--- a/testsuite/tests/Data/Comp/Variables_Test.hs
+++ b/testsuite/tests/Data/Comp/Variables_Test.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE TemplateHaskell, TypeSynonymInstances, FlexibleInstances, MultiParamTypeClasses, 
   TypeOperators, FlexibleContexts, ConstraintKinds #-}
+{-# LANGUAGE DeriveFunctor #-}
 
 module Data.Comp.Variables_Test where
 
@@ -29,13 +30,17 @@
 data Val e = Abs Var e
            | Var Var
            | Int Int
+  deriving Functor
 
 data Op e = App e e
           | Plus e e
+  deriving Functor
 
 data Let e = Let Var e e
+  deriving Functor
 
 data LetRec e = LetRec Var e e
+  deriving Functor
 
 type Sig = Op :+: Val
 
@@ -43,7 +48,7 @@
 
 type SigRec = LetRec :+: Sig
 
-$(derive [makeFunctor, makeTraversable, makeFoldable,
+$(derive [makeTraversable, makeFoldable,
           makeEqF, makeShowF, smartConstructors]
          [''Op, ''Val, ''Let, ''LetRec])
 
diff --git a/testsuite/tests/Test/Utils.hs b/testsuite/tests/Test/Utils.hs
--- a/testsuite/tests/Test/Utils.hs
+++ b/testsuite/tests/Test/Utils.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE TemplateHaskell, TypeOperators, FlexibleContexts, FlexibleInstances, ConstraintKinds #-}
+{-# LANGUAGE DeriveFunctor #-}
 
 module Test.Utils where
 
@@ -12,11 +13,13 @@
               | UnNode l e
               | BinNode e l e
               | TerNode l e e e
+              deriving Functor
 
 data Pair a e = Pair a e
+  deriving Functor
 
 $(derive
-  [makeFunctor, makeFoldable, makeShowF, makeEqF, makeArbitraryF]
+  [makeFoldable, makeShowF, makeEqF, makeArbitraryF]
   [''Tree, ''Pair])
 
 $(derive