diff --git a/yesod/scaffold.hs b/yesod/scaffold.hs
index fd6f5c94..728506ec 100644
--- a/yesod/scaffold.hs
+++ b/yesod/scaffold.hs
@@ -92,13 +92,19 @@ scaffold = do
     puts $(codegenDir "input" "database")
     
     backendC <- prompt $ flip elem $ map (return . toLower . head . show) backends
-    let (backend, importGenericDB, dbMonad, importDB, mkPersistSettings) =
+    let (backend, importGenericDB, dbMonad, importPersist, mkPersistSettings) =
             case backendC of
-                "s" -> (Sqlite,     "GenericSql", "SqlPersist", "import Database.Persist.Sqlite\n", "sqlSettings")
-                "p" -> (Postgresql, "GenericSql", "SqlPersist", "import Database.Persist.Postgresql\n", "sqlSettings")
-                "m" -> (MongoDB,    "MongoDB", "Action", "import Database.Persist.MongoDB\nimport Control.Applicative (Applicative)\n", "MkPersistSettings { mpsBackend = ConT ''Action }")
-                "t" -> (Tiny, "","","","")
+                "s" -> (Sqlite,     "GenericSql", "SqlPersist", "Sqlite\n", "sqlSettings")
+                "p" -> (Postgresql, "GenericSql", "SqlPersist", "Postgresql\n", "sqlSettings")
+                "m" -> (MongoDB,    "MongoDB", "Action", "MongoDB\nimport Control.Applicative (Applicative)\n", "MkPersistSettings { mpsBackend = ConT ''Action }")
+                "t" -> (Tiny, "","","",undefined)
                 _ -> error $ "Invalid backend: " ++ backendC
+        (modelImports) = case backend of
+          MongoDB -> "import Database.Persist." ++ importGenericDB ++ "\nimport Language.Haskell.TH.Syntax"
+          Sqlite -> ""
+          Postgresql -> ""
+          Tiny -> undefined
+
         uncapitalize s = toLower (head s) : tail s
         backendLower = uncapitalize $ show backend 
         upper = show backend
@@ -111,9 +117,9 @@ scaffold = do
           MongoDB    -> $(codegen $ "mongoDBConnPool")
           Tiny       -> ""
 
-        textImport = case backend of
-          Postgresql -> ", concat, append, snoc, pack"
-          _          -> ""
+        settingsTextImport = case backend of
+          Postgresql -> "import Text.Shakespeare.Text (st)\nimport Data.Text (Text, concat)"
+          _          -> "import Data.Text"
 
         packages = if backend == MongoDB then ", mongoDB\n               , bson\n" else ""
 
diff --git a/yesod/scaffold/Model.hs.cg b/yesod/scaffold/Model.hs.cg
index 827c9611..87f7e502 100644
--- a/yesod/scaffold/Model.hs.cg
+++ b/yesod/scaffold/Model.hs.cg
@@ -3,8 +3,7 @@ module Model where
 
 import Yesod
 import Data.Text (Text)
-import Database.Persist.~importGenericDB~
-import Language.Haskell.TH.Syntax
+~modelImports~
 
 -- You can define all of your database entities in the entities file.
 -- You can find more information on persistent and how to declare entities
diff --git a/yesod/scaffold/config/Settings.hs.cg b/yesod/scaffold/config/Settings.hs.cg
index c5f7c53a..6a514d91 100644
--- a/yesod/scaffold/config/Settings.hs.cg
+++ b/yesod/scaffold/config/Settings.hs.cg
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP #-}
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TemplateHaskell, QuasiQuotes #-}
 {-# LANGUAGE OverloadedStrings #-}
 -- | Settings are centralized, as much as possible, into this file. This
 -- includes database connection settings, static file locations, etc.
@@ -11,6 +11,7 @@ module Settings
     , cassiusFile
     , juliusFile
     , luciusFile
+    , textFile
     , widgetFile
     , ConnectionPool
     , withConnectionPool
@@ -22,17 +23,19 @@ module Settings
     , AppConfig(..)
     ) where
 
-import qualified Text.Hamlet as H
-import qualified Text.Cassius as H
-import qualified Text.Julius as H
-import qualified Text.Lucius as H
+import qualified Text.Hamlet as S
+import qualified Text.Cassius as S
+import qualified Text.Julius as S
+import qualified Text.Lucius as S
+import qualified Text.Shakespeare.Text as S
+import Text.Shakespeare.Text (st)
 import Language.Haskell.TH.Syntax
-~importDB~
+import Database.Persist.~importPersist~
 import Yesod (liftIO, MonadControlIO, addWidget, addCassius, addJulius, addLucius, whamletFile)
-import Data.Monoid (mempty, mappend)
+import Data.Monoid (mempty)
 import System.Directory (doesFileExist)
 import Prelude hiding (concat)
-import Data.Text (Text~textImport~)
+~settingsTextImport~
 import Data.Object
 import qualified Data.Object.Yaml as YAML
 import Control.Monad (join)
@@ -114,7 +117,7 @@ staticDir = "static"
 --
 -- To see how this value is used, see urlRenderOverride in ~sitearg~.hs
 staticRoot :: AppConfig ->  Text
-staticRoot conf = (appRoot conf) `mappend` "/static"
+staticRoot conf = [st|#{appRoot conf}/static|]
 
 
 -- The rest of this file contains settings which rarely need changing by a
@@ -144,30 +147,38 @@ globFile :: String -> String -> FilePath
 globFile kind x = kind ++ "/" ++ x ++ "." ++ kind
 
 hamletFile :: FilePath -> Q Exp
-hamletFile = H.hamletFile . globFile "hamlet"
+hamletFile = S.hamletFile . globFile "hamlet"
 
 cassiusFile :: FilePath -> Q Exp
 cassiusFile = 
 #ifdef PRODUCTION
-  H.cassiusFile . globFile "cassius"
+  S.cassiusFile . globFile "cassius"
 #else
-  H.cassiusFileDebug . globFile "cassius"
+  S.cassiusFileDebug . globFile "cassius"
 #endif
 
 luciusFile :: FilePath -> Q Exp
 luciusFile = 
 #ifdef PRODUCTION
-  H.luciusFile . globFile "lucius"
+  S.luciusFile . globFile "lucius"
 #else
-  H.luciusFileDebug . globFile "lucius"
+  S.luciusFileDebug . globFile "lucius"
 #endif
 
 juliusFile :: FilePath -> Q Exp
 juliusFile =
 #ifdef PRODUCTION
-  H.juliusFile . globFile "julius"
+  S.juliusFile . globFile "julius"
 #else
-  H.juliusFileDebug . globFile "julius"
+  S.juliusFileDebug . globFile "julius"
+#endif
+
+textFile :: FilePath -> Q Exp
+textFile =
+#ifdef PRODUCTION
+  S.textFile . globFile "text"
+#else
+  S.textFileDebug . globFile "text"
 #endif
 
 widgetFile :: FilePath -> Q Exp
diff --git a/yesod/scaffold/config/settings.yml.cg b/yesod/scaffold/config/settings.yml.cg
index 38053042..a44108f6 100644
--- a/yesod/scaffold/config/settings.yml.cg
+++ b/yesod/scaffold/config/settings.yml.cg
@@ -1,5 +1,5 @@
 Default: &defaults
-  appRoot: http://localhost
+  appRoot: "http://localhost"
   appPort: 3000
   connectionPoolSize: 10
 
diff --git a/yesod/scaffold/postgresqlConnPool.cg b/yesod/scaffold/postgresqlConnPool.cg
index 9dab35cb..9cf1129b 100644
--- a/yesod/scaffold/postgresqlConnPool.cg
+++ b/yesod/scaffold/postgresqlConnPool.cg
@@ -12,12 +12,12 @@ withConnectionPool conf f = do
     loadConnStr env = do
         allSettings <- (join $ YAML.decodeFile ("config/~backendLower~.yml" :: String)) >>= fromMapping
         settings <- lookupMapping (show env) allSettings
-        database <- lookupScalar "database" settings
+        database <- lookupScalar "database" settings :: IO Text
 
         connPart <- fmap concat $ (flip mapM) ["user", "password", "host", "port"] $ \key -> do
           value <- lookupScalar key settings
-          return $ append (snoc (pack key) '=') (snoc value ' ')
-        return $ append connPart (append " dbname= " database)
+          return $ [st| #{key}=#{value} |]
+        return $ [st|#{connPart} dbname=#{database}|]
 
 -- Example of making a dynamic configuration static
 -- use /return $(mkConnStr Production)/ instead of loadConnStr
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index caf4cc33..49923e84 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -70,6 +70,7 @@ executable         ~project~
                  , hamlet               >= 0.10     && < 0.11
                  , shakespeare-css      >= 0.10     && < 0.11
                  , shakespeare-js       >= 0.10     && < 0.11
+                 , shakespeare-text     >= 0.10     && < 0.11
                  , hjsmin
                  , transformers
                  , data-object
diff --git a/yesod/scaffold/sqliteConnPool.cg b/yesod/scaffold/sqliteConnPool.cg
index c1b2d434..ba4981f2 100644
--- a/yesod/scaffold/sqliteConnPool.cg
+++ b/yesod/scaffold/sqliteConnPool.cg
@@ -12,9 +12,7 @@ withConnectionPool conf f = do
     loadConnStr env = do
         allSettings <- (join $ YAML.decodeFile ("config/~backendLower~.yml" :: String)) >>= fromMapping
         settings <- lookupMapping (show env) allSettings
-        database <- lookupScalar "database" settings
-
-        return database
+        lookupScalar "database" settings
 
 -- Example of making a dynamic configuration static
 -- use /return $(mkConnStr Production)/ instead of loadConnStr