diff --git a/yesod-examples/src/chat.hs b/yesod-examples/src/chat.hs
index b02a47fc..d0551238 100644
--- a/yesod-examples/src/chat.hs
+++ b/yesod-examples/src/chat.hs
@@ -6,7 +6,7 @@
 module Main where
 
 import Yesod
-import Yesod.Helpers.Static
+import Yesod.Static
 
 import Control.Concurrent.STM
 import Control.Concurrent.STM.TChan
@@ -18,8 +18,6 @@ import Data.Text (Text, unpack)
 -- speaker and content
 data Message = Message Text Text
 
-type Handler yesod = GHandler yesod yesod
-
 -- all those TChans are dupes, so writing to any one writes to them all, but reading is separate
 data Chat = Chat
   { chatClients    :: TVar [(Int, TChan Message)]
@@ -54,7 +52,7 @@ instance Yesod Chat where
     \
 |]
 
-getHomeR :: Handler Chat RepHtml
+getHomeR :: Handler RepHtml
 getHomeR = do
   Chat clients next _ <- getYesod
   client <- liftIO . atomically $ do
@@ -68,7 +66,7 @@ getHomeR = do
     return c
   defaultLayout $ do
     setTitle "Chat Page"
-    addWidget [$hamlet|\
+    toWidget [$hamlet|\
 \<!DOCTYPE html>
 
 <h1>Chat Example
@@ -81,7 +79,7 @@ getHomeR = do
 <script>var clientNumber = #{show client}
 |]
 
-getCheckR :: Handler Chat RepJson
+getCheckR :: Handler RepJson
 getCheckR = do
   liftIO $ putStrLn "Check"
   Chat clients _ _ <- getYesod
@@ -101,7 +99,7 @@ getCheckR = do
 
 zipJson x y = jsonMap $ map (unpack *** jsonScalar . unpack) $ zip x y
 
-getPostR :: Handler Chat RepJson
+getPostR :: Handler RepJson
 getPostR = do
   liftIO $ putStrLn "Post"
   Chat clients _ _ <- getYesod
@@ -122,4 +120,5 @@ main :: IO ()
 main = do
   clients <- newTVarIO []
   next <- newTVarIO 0
-  warpDebug 3000 $ Chat clients next $ static "static"
+  s <- static "static"
+  warpDebug 3000 $ Chat clients next s
diff --git a/yesod-examples/src/i18n.lhs b/yesod-examples/src/i18n.lhs
index abbe39a1..001cad3e 100644
--- a/yesod-examples/src/i18n.lhs
+++ b/yesod-examples/src/i18n.lhs
@@ -3,14 +3,23 @@
 > {-# LANGUAGE TypeFamilies #-}
 > {-# LANGUAGE MultiParamTypeClasses #-}
 > {-# LANGUAGE OverloadedStrings #-}
+> {-# LANGUAGE CPP #-}
 
 > import Yesod
 > import Data.Monoid (mempty)
 > import Data.Text (Text)
 
+To work on both ghc6 and ghc7
+
+#if GHC7
+# define QQ(x) x
+#else
+# define QQ(x) $x
+#endif
+
 > data I18N = I18N
 
-> mkYesod "I18N" [$parseRoutes|
+> mkYesod "I18N" [QQ(parseRoutes)|
 > /            HomepageR GET
 > /set/#Text SetLangR  GET
 > |]
@@ -29,7 +38,7 @@
 >             ]
 >     defaultLayout $ do
 >       setTitle "I18N Homepage"
->       addHamlet [$hamlet|
+>       addHamlet [QQ(hamlet)|
 > <h1>#{hello}
 > <p>In other languages:
 > <ul>
diff --git a/yesod-examples/synopsis/hamlet.lhs b/yesod-examples/synopsis/hamlet.lhs
index 7f3e2b05..a700a1ec 100644
--- a/yesod-examples/synopsis/hamlet.lhs
+++ b/yesod-examples/synopsis/hamlet.lhs
@@ -2,8 +2,11 @@
 {-# LANGUAGE QuasiQuotes, OverloadedStrings #-}
 
 import Text.Hamlet
-import qualified Data.ByteString.Lazy as L
+import Yesod.Widget
 import Data.Text (Text, cons)
+import qualified Data.Text.Lazy.IO as L
+import Text.Blaze.Renderer.Text (renderHtml)
+
 
 data Person = Person
     { name :: String
@@ -18,12 +21,12 @@ renderUrls :: PersonUrls -> [(Text, Text)] -> Text
 renderUrls Homepage _ = "/"
 renderUrls (PersonPage name) _ = '/' `cons` name
 
-footer :: Hamlet url
+footer :: HtmlUrl url
 footer = [$hamlet|\
 <div id="footer">Thank you, come again
 |]
 
-template :: Person -> Hamlet PersonUrls
+template :: Person -> HtmlUrl PersonUrls
 template person = [$hamlet|
 !!!
 
@@ -31,8 +34,8 @@ template person = [$hamlet|
     <head>
         <title>Hamlet Demo
     <body>
-        <h1>Information on #{string (name person)}
-        <p>#{string (name person)} is #{string (age person)} years old.
+        <h1>Information on #{name person}
+        <p>#{name person} is #{age person} years old.
         <h2>
             $if isMarried person
                 \Married
@@ -40,7 +43,7 @@ template person = [$hamlet|
                 \Not married
         <ul>
             $forall child <- children person
-                <li>#{string child}
+                <li>#{child}
         <p>
             <a href="@{page person}">See the page.
         \^{footer}
@@ -55,7 +58,7 @@ main = do
             , isMarried = True
             , children = ["Adam", "Ben", "Chris"]
             }
-    L.putStrLn $ renderHamlet renderUrls $ template person
+    L.putStrLn $ renderHtml $ (template person) renderUrls 
 \end{code}
 
 Outputs (new lines added for readability):
diff --git a/yesod-examples/yesod-examples.cabal b/yesod-examples/yesod-examples.cabal
index 2aa11620..c1bbcd6d 100644
--- a/yesod-examples/yesod-examples.cabal
+++ b/yesod-examples/yesod-examples.cabal
@@ -15,6 +15,8 @@ extra-source-files:  static/yesod/ajax/script.js,
                      static/yesod/ajax/style.css,
                      static/chat.js
 
+flag ghc7
+
 Executable yesod-blog
   Main-is:             src/blog.lhs
   Build-depends:       base >= 4 && < 5,
@@ -40,6 +42,8 @@ Executable yesod-pretty-yaml
 
 Executable yesod-i18n
   Main-is:             src/i18n.lhs
+  if flag(ghc7)
+      cpp-options:     -DGHC7
 
 Executable yesod-session
   Main-is:             src/session.lhs
@@ -62,7 +66,7 @@ Executable yesod-persistent-synopsis
 
 Executable yesod-hamlet-synopsis
   Main-is:             synopsis/hamlet.lhs
-  Build-depends:       hamlet
+  Build-depends:       hamlet, yesod-core
 
 Executable yesod-chat
   Main-is:             src/chat.hs
