diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 79299aaf..cb8b1af9 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -10,7 +10,7 @@ module Application
 
 import Foundation
 import Settings
-import Yesod.Static
+import Settings.StaticFiles (static)
 import Yesod.Auth
 import Yesod.Logger (makeLogger, flushLogger, Logger, logString, logLazyText)
 import Database.Persist.~importGenericDB~
@@ -46,11 +46,7 @@ getRobotsR = return $ RepPlain $ toContent ("User-agent: *" :: ByteString)
 -- migrations handled by Yesod.
 with~sitearg~ :: AppConfig -> Logger -> (Application -> IO a) -> IO ()
 with~sitearg~ conf logger f = do
-#ifdef PRODUCTION
     s <- static Settings.staticDir
-#else
-    s <- staticDevel Settings.staticDir
-#endif
     Settings.withConnectionPool conf $ \p -> do
         runConnectionPool (runMigration migrateAll) p
         let h = ~sitearg~ conf logger s p
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index a91602a8..e09c887e 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -17,7 +17,7 @@ module Foundation
     ) where
 
 import Yesod
-import Yesod.Static
+import Yesod.Static (Static, base64md5, StaticRoute(..))
 import Settings.StaticFiles
 import Yesod.Auth
 import Yesod.Auth.OpenId
@@ -177,7 +177,7 @@ instance YesodAuthEmail ~sitearg~ where
             , partContent = Data.Text.Lazy.Encoding.encodeUtf8 [stext|
 Please confirm your email address by clicking on the link below.
 
-  #{verurl}
+\#{verurl}
 
 Thank you
 |]
diff --git a/yesod/scaffold/Settings/StaticFiles.hs.cg b/yesod/scaffold/Settings/StaticFiles.hs.cg
index d7941ba6..b59d0ca0 100644
--- a/yesod/scaffold/Settings/StaticFiles.hs.cg
+++ b/yesod/scaffold/Settings/StaticFiles.hs.cg
@@ -1,7 +1,16 @@
-{-# LANGUAGE QuasiQuotes, TemplateHaskell, TypeFamilies #-}
+{-# LANGUAGE CPP, QuasiQuotes, TemplateHaskell, TypeFamilies #-}
 module Settings.StaticFiles where
 
 import Yesod.Static
+import qualified Yesod.Static as Static
+
+static :: FilePath -> IO Static
+#ifdef PRODUCTION
+static = Static.static
+#else
+static = Static.staticDevel
+#endif
+
 
 -- | This generates easy references to files in the static directory at compile time.
 --   The upside to this is that you have compile-time verification that referenced files
diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index 48365017..e1621bba 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -14,7 +14,7 @@ module Foundation
     ) where
 
 import Yesod.Core
-import Yesod.Static
+import Yesod.Static (Static, base64md5, StaticRoute(..))
 import Settings.StaticFiles
 import Yesod.Logger (Logger, logLazyText)
 import qualified Settings