diff --git a/yesod/scaffold/sitearg.hs.cg b/yesod/scaffold/sitearg.hs.cg
index c17389fc..fd489fbb 100644
--- a/yesod/scaffold/sitearg.hs.cg
+++ b/yesod/scaffold/sitearg.hs.cg
@@ -17,6 +17,7 @@ module ~sitearg~
 
 import Yesod
 import Yesod.Static
+import StaticFiles
 import Yesod.Auth
 import Yesod.Auth.OpenId
 import Yesod.Auth.Email
diff --git a/yesod/scaffold/tiny/sitearg.hs.cg b/yesod/scaffold/tiny/sitearg.hs.cg
index fb2845f0..a39c7db6 100644
--- a/yesod/scaffold/tiny/sitearg.hs.cg
+++ b/yesod/scaffold/tiny/sitearg.hs.cg
@@ -15,6 +15,7 @@ module ~sitearg~
 
 import Yesod.Core
 import Yesod.Static
+import StaticFiles
 import Yesod.Logger (Logger, logLazyText)
 import qualified Settings
 import System.Directory
diff --git a/yesod/tests/run.sh b/yesod/tests/run.sh
index 3ae9eed9..51cad6e3 100755
--- a/yesod/tests/run.sh
+++ b/yesod/tests/run.sh
@@ -11,7 +11,7 @@ cabal clean && cabal install && cabal sdist
 for f in $(ls -1rt dist/*.tar.gz | tail -1)
 do
   tar -xzvf $f && cd `basename $f .tar.gz`
-  shelltest ../tests/scaffold.shelltest -c $@
+  shelltest ../tests/scaffold.shelltest --color --diff $@
   cd ..
   rm -r `basename $f .tar.gz`
 done
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 589edba1..b4bc2921 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -30,7 +30,7 @@ extra-source-files:
   scaffold/tiny/Handler/Root.hs.cg
   scaffold/tiny/config/routes.cg
   scaffold/tiny/config/Settings.hs.cg
-  scaffold/static/css/html5boilerplate.css.cg
+  scaffold/static/css/normalize.css.cg
   scaffold/postgresqlConnPool.cg
   scaffold/sqliteConnPool.cg
   scaffold/.ghci.cg