diff --git a/yesod-bin/hsfiles/mongo.hsfiles b/yesod-bin/hsfiles/mongo.hsfiles
index d523d061..7e97af85 100644
--- a/yesod-bin/hsfiles/mongo.hsfiles
+++ b/yesod-bin/hsfiles/mongo.hsfiles
@@ -10,6 +10,7 @@ config/client_session_key.aes
 *.o
 *.sqlite3
 .hsenv*
+cabal-dev/
 yesod-devel/
 
 {-# START_FILE Application.hs #-}
@@ -5729,10 +5730,10 @@ $maybe msg <- mmsg
 
   <li>
     A Widget's Html, Css and Javascript are separated in three files with the #
-    \<em>.hamlet</em>, <em>.lucius</em> and <em>.julius</em> extensions. 
+    \<em>.hamlet</em>, <em>.lucius</em> and <em>.julius</em> extensions.
 
   <li ##{aDomId}>If you had javascript enabled then you wouldn't be seeing this.
-    
+
   <li #form>
     This is an example trivial Form. Read the #
     \<a href="http://www.yesodweb.com/book/forms">Forms chapter</a> #
diff --git a/yesod-bin/hsfiles/mysql.hsfiles b/yesod-bin/hsfiles/mysql.hsfiles
index f71ba69a..68ee8af1 100644
--- a/yesod-bin/hsfiles/mysql.hsfiles
+++ b/yesod-bin/hsfiles/mysql.hsfiles
@@ -10,6 +10,7 @@ config/client_session_key.aes
 *.o
 *.sqlite3
 .hsenv*
+cabal-dev/
 yesod-devel/
 
 {-# START_FILE Application.hs #-}
@@ -5759,10 +5760,10 @@ $maybe msg <- mmsg
 
   <li>
     A Widget's Html, Css and Javascript are separated in three files with the #
-    \<em>.hamlet</em>, <em>.lucius</em> and <em>.julius</em> extensions. 
+    \<em>.hamlet</em>, <em>.lucius</em> and <em>.julius</em> extensions.
 
   <li ##{aDomId}>If you had javascript enabled then you wouldn't be seeing this.
-    
+
   <li #form>
     This is an example trivial Form. Read the #
     \<a href="http://www.yesodweb.com/book/forms">Forms chapter</a> #
diff --git a/yesod-bin/hsfiles/postgres-fay.hsfiles b/yesod-bin/hsfiles/postgres-fay.hsfiles
index 15dea3bf..0f84e977 100644
--- a/yesod-bin/hsfiles/postgres-fay.hsfiles
+++ b/yesod-bin/hsfiles/postgres-fay.hsfiles
@@ -11,6 +11,7 @@ config/client_session_key.aes
 *.sqlite3
 fay/Language/Fay/Yesod.hs
 .hsenv*
+cabal-dev/
 yesod-devel/
 
 {-# START_FILE Application.hs #-}
@@ -433,8 +434,8 @@ library
                  , yesod-auth                    >= 1.2        && < 1.3
                  , yesod-static                  >= 1.2        && < 1.3
                  , yesod-form                    >= 1.3        && < 1.4
-                 , yesod-fay                     >= 0.1
-                 , fay                           >= 0.9
+                 , yesod-fay                     >= 0.4
+                 , fay                           >= 0.16
                  , bytestring                    >= 0.9        && < 0.11
                  , text                          >= 0.11       && < 0.12
                  , persistent                    >= 1.2        && < 1.3
@@ -894,7 +895,7 @@ data Command = GetFib Int (Returns Int)
 module Home where
 
 import Prelude
-import Language.Fay.FFI
+import Fay.FFI
 import Language.Fay.Yesod
 import SharedTypes
 
@@ -5840,10 +5841,10 @@ $maybe msg <- mmsg
 
   <li>
     A Widget's Html, Css and Javascript are separated in three files with the #
-    \<em>.hamlet</em>, <em>.lucius</em> and <em>.julius</em> extensions. 
+    \<em>.hamlet</em>, <em>.lucius</em> and <em>.julius</em> extensions.
 
   <li ##{aDomId}>If you had javascript enabled then you wouldn't be seeing this.
-    
+
   <li #form>
     This is an example trivial Form. Read the #
     \<a href="http://www.yesodweb.com/book/forms">Forms chapter</a> #
diff --git a/yesod-bin/hsfiles/postgres.hsfiles b/yesod-bin/hsfiles/postgres.hsfiles
index 81355918..d0103d95 100644
--- a/yesod-bin/hsfiles/postgres.hsfiles
+++ b/yesod-bin/hsfiles/postgres.hsfiles
@@ -10,6 +10,7 @@ config/client_session_key.aes
 *.o
 *.sqlite3
 .hsenv*
+cabal-dev/
 yesod-devel/
 
 {-# START_FILE Application.hs #-}
@@ -5733,10 +5734,10 @@ $maybe msg <- mmsg
 
   <li>
     A Widget's Html, Css and Javascript are separated in three files with the #
-    \<em>.hamlet</em>, <em>.lucius</em> and <em>.julius</em> extensions. 
+    \<em>.hamlet</em>, <em>.lucius</em> and <em>.julius</em> extensions.
 
   <li ##{aDomId}>If you had javascript enabled then you wouldn't be seeing this.
-    
+
   <li #form>
     This is an example trivial Form. Read the #
     \<a href="http://www.yesodweb.com/book/forms">Forms chapter</a> #
diff --git a/yesod-bin/hsfiles/simple.hsfiles b/yesod-bin/hsfiles/simple.hsfiles
index 1c452855..2cc72588 100644
--- a/yesod-bin/hsfiles/simple.hsfiles
+++ b/yesod-bin/hsfiles/simple.hsfiles
@@ -10,6 +10,7 @@ config/client_session_key.aes
 *.o
 *.sqlite3
 .hsenv*
+cabal-dev/
 yesod-devel/
 
 {-# START_FILE Application.hs #-}
@@ -5610,10 +5611,10 @@ $maybe msg <- mmsg
 
   <li>
     A Widget's Html, Css and Javascript are separated in three files with the #
-    \<em>.hamlet</em>, <em>.lucius</em> and <em>.julius</em> extensions. 
+    \<em>.hamlet</em>, <em>.lucius</em> and <em>.julius</em> extensions.
 
   <li ##{aDomId}>If you had javascript enabled then you wouldn't be seeing this.
-    
+
   <li #form>
     This is an example trivial Form. Read the #
     \<a href="http://www.yesodweb.com/book/forms">Forms chapter</a> #
diff --git a/yesod-bin/hsfiles/sqlite.hsfiles b/yesod-bin/hsfiles/sqlite.hsfiles
index 961133fc..2dd6d697 100644
--- a/yesod-bin/hsfiles/sqlite.hsfiles
+++ b/yesod-bin/hsfiles/sqlite.hsfiles
@@ -10,6 +10,7 @@ config/client_session_key.aes
 *.o
 *.sqlite3
 .hsenv*
+cabal-dev/
 yesod-devel/
 
 {-# START_FILE Application.hs #-}
@@ -5729,10 +5730,10 @@ $maybe msg <- mmsg
 
   <li>
     A Widget's Html, Css and Javascript are separated in three files with the #
-    \<em>.hamlet</em>, <em>.lucius</em> and <em>.julius</em> extensions. 
+    \<em>.hamlet</em>, <em>.lucius</em> and <em>.julius</em> extensions.
 
   <li ##{aDomId}>If you had javascript enabled then you wouldn't be seeing this.
-    
+
   <li #form>
     This is an example trivial Form. Read the #
     \<a href="http://www.yesodweb.com/book/forms">Forms chapter</a> #