diff --git a/yesod/scaffold/Model.hs.cg b/yesod/scaffold/Model.hs.cg
index d37218a8..1ad3e23f 100644
--- a/yesod/scaffold/Model.hs.cg
+++ b/yesod/scaffold/Model.hs.cg
@@ -8,5 +8,5 @@ import Data.Text (Text)
 -- You can find more information on persistent and how to declare entities
 -- at:
 -- http://www.yesodweb.com/book/persistent/
-share [mkPersist, mkMigrate "migrateAll"] $(persistFile "config/models")
+share [mkPersist sqlSettings, mkMigrate "migrateAll"] $(persistFile "config/models")
 
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index 1c0e9476..caf4cc33 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -67,7 +67,9 @@ executable         ~project~
                  , persistent-~backendLower~ >= 0.6 && < 0.7
                  ~packages~
                  , template-haskell
-                 , hamlet
+                 , hamlet               >= 0.10     && < 0.11
+                 , shakespeare-css      >= 0.10     && < 0.11
+                 , shakespeare-js       >= 0.10     && < 0.11
                  , hjsmin
                  , transformers
                  , data-object
diff --git a/yesod/scaffold/sitearg.hs.cg b/yesod/scaffold/sitearg.hs.cg
index 207884f0..c17389fc 100644
--- a/yesod/scaffold/sitearg.hs.cg
+++ b/yesod/scaffold/sitearg.hs.cg
@@ -127,7 +127,7 @@ instance Yesod ~sitearg~ where
 
 -- How to run database actions.
 instance YesodPersist ~sitearg~ where
-    type YesodDB ~sitearg~ = SqlPersist
+    type YesodPersistBackend ~sitearg~ = SqlPersist
     runDB f = liftIOHandler
             $ fmap connPool getYesod >>= Settings.runConnectionPool f
 
diff --git a/yesod/scaffold/tiny/cabal.cg b/yesod/scaffold/tiny/cabal.cg
index 30b9e2ed..3eebaae6 100644
--- a/yesod/scaffold/tiny/cabal.cg
+++ b/yesod/scaffold/tiny/cabal.cg
@@ -55,6 +55,8 @@ executable         ~project~
                  , text
                  , template-haskell
                  , hamlet
+                 , shakespeare-css
+                 , shakespeare-js
                  , transformers
                  , data-object
                  , data-object-yaml