diff --git a/project_template/barebones/src/Main.hs b/project_template/barebones/src/Main.hs
--- a/project_template/barebones/src/Main.hs
+++ b/project_template/barebones/src/Main.hs
@@ -7,7 +7,10 @@
 import           Snap.Http.Server
 
 main :: IO ()
-main = quickHttpServe $
+main = quickHttpServe site
+
+site :: Snap ()
+site =
     ifTop (writeBS "hello world") <|>
     route [ ("foo", writeBS "bar")
           , ("echo/:echoparam", echoHandler)
diff --git a/project_template/default/foo.cabal b/project_template/default/foo.cabal
--- a/project_template/default/foo.cabal
+++ b/project_template/default/foo.cabal
@@ -23,7 +23,7 @@
     bytestring >= 0.9.1 && < 0.10,
     data-lens >= 2.0.1 && < 2.1,
     data-lens-template >= 2.1 && < 2.2,
-    heist >= 0.7 && < 0.8,
+    heist >= 0.8 && < 0.9,
     MonadCatchIO-transformers >= 0.2.1 && < 0.3,
     mtl >= 2 && < 3,
     snap == 0.8.*,
diff --git a/project_template/tutorial/src/Tutorial.lhs b/project_template/tutorial/src/Tutorial.lhs
--- a/project_template/tutorial/src/Tutorial.lhs
+++ b/project_template/tutorial/src/Tutorial.lhs
@@ -287,9 +287,10 @@
           |-- images/
           |-- js/
       |-- *snaplets/*
+          |-- *heist/*
+              |-- templates/
           |-- subsnaplet1/
           |-- subsnaplet2/
-      |-- templates/
 
 Only the starred items are actually enforced by current code, but we want to
 establish the others as a convention.  The file snaplet.cfg is automatically
@@ -344,7 +345,7 @@
     data-files:
       resources/snaplet.cfg,
       resources/public/stylesheets/style.css,
-      resources/templates/page.tpl
+      resources/snaplets/heist/templates/page.tpl
 
 Now whenever your snaplet is used, its filesystem data will be automagically
 copied into the local project that is using it, whenever the application is
diff --git a/snap.cabal b/snap.cabal
--- a/snap.cabal
+++ b/snap.cabal
@@ -1,5 +1,5 @@
 name:           snap
-version:        0.8.0.1
+version:        0.8.0.2
 synopsis:       Snap: A Haskell Web Framework: project starter executable and glue code library
 description:    Snap Framework project starter executable and glue code library
 license:        BSD3
diff --git a/src/Snap/Snaplet/Internal/Types.hs b/src/Snap/Snaplet/Internal/Types.hs
--- a/src/Snap/Snaplet/Internal/Types.hs
+++ b/src/Snap/Snaplet/Internal/Types.hs
@@ -22,7 +22,6 @@
 import           Data.Lens.Lazy
 import           Data.Lens.Template
 import           Data.Text (Text)
-import qualified Data.Text as T
 
 import           Snap.Core
 import qualified Snap.Snaplet.Internal.LensT as LT