diff --git a/collects/meta/web/stubs/blog.rkt b/collects/meta/web/stubs/blog.rkt
index 95ec221026..9b9adb15e9 100644
--- a/collects/meta/web/stubs/blog.rkt
+++ b/collects/meta/web/stubs/blog.rkt
@@ -4,6 +4,7 @@
 
 (provide blog)
 (define blog
-  (page #:file ""
+  @page[#:file ""
         ;; #:part-of community  <-- TODO: is doing this a good idea
-    "This is a stub page to get the header for the blog."))
+        ]{
+    This is a stub page to get the header for the blog.})
diff --git a/collects/meta/web/stubs/git.rkt b/collects/meta/web/stubs/git.rkt
index 7b8a31fdd4..fc245c3bf9 100644
--- a/collects/meta/web/stubs/git.rkt
+++ b/collects/meta/web/stubs/git.rkt
@@ -4,5 +4,5 @@
 
 (provide git)
 (define git
-  (page #:title "Development Repository" #:file ""
-    "This is a stub page to get the header for the gitweb server."))
+  @page[#:title "Development Repository" #:file ""]{
+    This is a stub page to get the header for the gitweb server.})
diff --git a/collects/meta/web/stubs/planet.rkt b/collects/meta/web/stubs/planet.rkt
index 21cb39dfcd..a5f3a25a86 100644
--- a/collects/meta/web/stubs/planet.rkt
+++ b/collects/meta/web/stubs/planet.rkt
@@ -4,6 +4,6 @@
 
 (provide planet)
 (define planet
-  (page #:file "" #:link-title "PLaneT" #:window-title "{{{TITLE}}}"
-    ;; This is a stub page to get the header for planet
-    "{{{BODY}}}"))
+  @page[#:file "" #:link-title "PLaneT" #:window-title "{{{TITLE}}}"]{
+    @; This is a stub page to get the header for planet
+    {{{BODY}}}})
diff --git a/collects/meta/web/stubs/pre.rkt b/collects/meta/web/stubs/pre.rkt
index e9f0df7b3f..223c4a193d 100644
--- a/collects/meta/web/stubs/pre.rkt
+++ b/collects/meta/web/stubs/pre.rkt
@@ -4,10 +4,10 @@
 
 (provide pre-root)
 (define pre-root
-  (page #:file "" #:title "Prebuilt materials"
-    "This is a stub page to get the header for the nightly builds root."))
+  @page[#:file "" #:title "Prebuilt materials"]{
+    This is a stub page to get the header for the nightly builds root.})
 
 (provide pre-installers)
 (define pre-installers
-  (page #:file "installers/" #:title "Nightly build installers"
-    "This is a stub page to get the header for the nightly installers."))
+  @page[#:file "installers/" #:title "Nightly build installers"]{
+    This is a stub page to get the header for the nightly installers.})
diff --git a/collects/meta/web/www/community.rkt b/collects/meta/web/www/community.rkt
index 6baa0b23a1..f922e7ece8 100644
--- a/collects/meta/web/www/community.rkt
+++ b/collects/meta/web/www/community.rkt
@@ -20,8 +20,8 @@
 
 (provide community)
 (define community
-  (page
-    (parlist @strong{Mailing Lists}
+  @page{
+    @parlist[@strong{Mailing Lists}
       @text{@maillist-email{users} @mdash a discussion list for all things
         related to Racket.  Ask your questions here!
         (@maillist-url{users}.)
@@ -34,13 +34,13 @@
         for the people who want to see how the sausages are made and help make
         them.  (@maillist-url{dev}.)
         @; @";" also on @gmane{plt.dev}.)
-        })
-    (parlist @strong{Discussion Channels}
+        }]
+    @parlist[@strong{Discussion Channels}
       @text{@irc-chat{Chat on IRC} in the @TT{@big{@strong{#racket}}} channel
         on @a[href: "http://freenode.net"]{@tt{freenode.net}}
         @mdash an informal discussion channel for all things related to Racket.
-        @irc-logs{Browse the logs}.})
-    (parlist @strong{Resources for Learning}
+        @irc-logs{Browse the logs}.}]
+    @parlist[@strong{Resources for Learning}
       (apply parlist @text{Documentation for getting started:} intros)
       @text{@-cookbook @mdash useful recipes, many of which apply to Racket.}
       @text{@-htdp @mdash a textbook for introductory programming, but also
@@ -48,16 +48,15 @@
         programming.@|rdquo|}
       @text{@-plai @mdash a textbook on programming languages.}
       @text{@-teachscheme @mdash a workshop to train teachers using @-htdp in
-        the classroom.})
-    (parlist @strong{PLT Scheme Inc.}
+        the classroom.}]
+    @parlist[@strong{PLT Scheme Inc.}
       @text{@blog @mdash announcements, helpful hints, and thoughtful rants.}
-      @text{@people @mdash the people behind Racket.}
-      )
-    (parlist @strong{Development}
+      @text{@people @mdash the people behind Racket.}]
+    @parlist[@strong{Development}
       @text{@git (also available on
             @a[href: "http://github.com/plt/racket/"]{GitHub})}
       @text{@pre-installers and @|pre-root|.}
       ;;TODO: proper reference
       @a[href: "http://download.racket-lang.org/chronology/"]{
         Release Announcements}
-      )))
+      ]})
diff --git a/collects/meta/web/www/download.rkt b/collects/meta/web/www/download.rkt
index 16afa9e49e..1504844565 100644
--- a/collects/meta/web/www/download.rkt
+++ b/collects/meta/web/www/download.rkt
@@ -5,9 +5,9 @@
 (provide download-button download)
 
 (define download
-  (page #:link-title "Download" #:window-title "Download Racket"
-        #:file "download/"
-    (render-download-page)))
+  @page[#:link-title "Download" #:window-title "Download Racket"
+        #:file "download/"]{
+    @(render-download-page)})
 
 (define download-button
   (let ([img1 (copyfile (in-here "download.png"))]
diff --git a/collects/meta/web/www/help.rkt b/collects/meta/web/www/help.rkt
index af3efc199a..d900e20275 100644
--- a/collects/meta/web/www/help.rkt
+++ b/collects/meta/web/www/help.rkt
@@ -4,11 +4,11 @@
 
 (provide help)
 (define help
-  (page #:link-title "Need Help?"
-   (parlist @strong{Don't Panic!}
+  @page[#:link-title "Need Help?"]{
+   @parlist[@strong{Don't Panic!}
             @text{Racket has a variety of resources designed to help you
-                  with any problems you may have.})
-   (parlist @strong{Help Desk}
+                  with any problems you may have.}]
+   @parlist[@strong{Help Desk}
             @text{Your first stop should always be with the help system that's
                   built into Racket and available from DrRacket's help menu
                   @strong{or by pressing F1 with the cursor on a search term}.
@@ -22,19 +22,19 @@
                   @a[href: "http://docs.plt-scheme.org/guide/"]{guide} (also
                   located in your local copy of the documentation) that
                   provides a narrative introduction to many of Racket's
-                  features.})
-   (parlist @strong{Learning how to Program}
-            @text{Try going through @|-htdp|.})
-   (parlist @strong{Searching the Web}
+                  features.}]
+   @parlist[@strong{Learning how to Program}
+            @text{Try going through @|-htdp|.}]
+   @parlist[@strong{Searching the Web}
             @text{The
                   @-cookbook is
                   a wiki for Scheme snippets, many of which work in Racket.
                   Additionally, your favorite search engine may well provide
-                  answers for many of your questions.})
-   (parlist @strong{The Mailing List}
+                  answers for many of your questions.}]
+   @parlist[@strong{The Mailing List}
             @text{The @tt|{users@racket-lang.org}| mailing list is a great
                   source for answers to questions when the above resources
                   don't pan out@";" sign up for it in the @community area of
-                  the website.})
+                  the website.}]
    @br
-   @text{Thanks for using Racket!}))
+   @text{Thanks for using Racket!}})
diff --git a/collects/meta/web/www/index.rkt b/collects/meta/web/www/index.rkt
index 94f0ef54ad..ce78cdb705 100644
--- a/collects/meta/web/www/index.rkt
+++ b/collects/meta/web/www/index.rkt
@@ -281,7 +281,7 @@
 
 (define (alts-panel l1 l2)
   (define l (append l1 l2))
-  (apply div class: 'slideshow
+  (div class: 'slideshow
          @script/inline[type: "text/javascript"]{
            var showing = 0;
            var help_showing = false;
@@ -405,17 +405,15 @@
                           after the filename. Alternatively, for a Unix installation, you can
                           add @tt{#!/usr/bin/env racket} at the top and make the
                           file executable, and then you can run the file directly.})))
-         (append
-          (for/list ([elem l]
-                     [pos (in-naturals)])
-            (div class: 'slideshowframe
-                 id: (format "frame~a" pos)
-                 style: (format "display: ~a" (if (zero? pos) "block" "none"))
-                 (example-code elem)))
-          (list
-           @script/inline[type: "text/javascript"]{
-             change_show_to(Math.floor(Math.random()* @(length l1)));
-           }))))
+         (for/list ([elem l]
+                    [pos (in-naturals)])
+           (div class: 'slideshowframe
+                id: (format "frame~a" pos)
+                style: (format "display: ~a" (if (zero? pos) "block" "none"))
+                (example-code elem)))
+          @script/inline[type: "text/javascript"]{
+            change_show_to(Math.floor(Math.random()* @(length l1)));
+          }))
 
 ;; TODO
 ;; (define screenshots
diff --git a/collects/meta/web/www/new-name.rkt b/collects/meta/web/www/new-name.rkt
index 6be780f720..8a594d33f7 100644
--- a/collects/meta/web/www/new-name.rkt
+++ b/collects/meta/web/www/new-name.rkt
@@ -52,8 +52,8 @@
     }})
 
 (define new-name
-  (page #:title "From PLT Scheme to Racket"
-    styles
+  @page[#:title "From PLT Scheme to Racket"]{
+    @styles
 
     @div[class: 'nestedheading]{PLT Scheme is a Racket}
 
@@ -188,4 +188,4 @@
         it has a vague connection to the word @|ldquo|scheme.@|rdquo|  Mostly,
         though, we just like it.}
 
-      }))
+      }})
diff --git a/collects/meta/web/www/outreach+research.rkt b/collects/meta/web/www/outreach+research.rkt
index 932036e3a4..f7f76ddfa9 100644
--- a/collects/meta/web/www/outreach+research.rkt
+++ b/collects/meta/web/www/outreach+research.rkt
@@ -15,25 +15,24 @@
 
 (provide outreach+research)
 (define outreach+research
-  (page
-    #:title "Outreach & Research"
-    #:link-title @list{Outreach@|nbsp|&@|nbsp|Research}
-    (parlist
+  @page[#:title "Outreach & Research"
+        #:link-title @list{Outreach@|nbsp|&@|nbsp|Research}]{
+    @parlist[
       @strong{Outreach}
       @text{@-teachscheme @mdash a workshop to train teachers using @-htdp in
             the classroom.}
-      @text{@-bootstrap @mdash a curriculum for middle-school students.})
-    (parlist @strong{Publications}
-             techreports brown-pubs nwu-pubs neu-pubs utah-pubs)
-    (parlist @strong{Graduate Study}
+      @text{@-bootstrap @mdash a curriculum for middle-school students.}]
+    @parlist[@strong{Publications}
+             techreports brown-pubs nwu-pubs neu-pubs utah-pubs]
+    @parlist[@strong{Graduate Study}
              @text{We welcome applications from students interested in
-                   @|graduate-study|.})))
+                   @|graduate-study|.}]})
 
 (define graduate-study
-  (page #:file "common-plt-app.html" #:part-of outreach+research
-    (define (box-style border-width color)
-      @list{border: @|border-width|px solid black; padding: 5px; @;
-            background: @|color|@";"})
+  @page[#:file "common-plt-app.html" #:part-of outreach+research]{
+    @(define (box-style border-width color)
+       @list{border: @|border-width|px solid black; padding: 5px; @;
+             background: @|color|@";"})
     @h1{Graduate Study with PLT}
     @p{An open letter to graduate applicants:}
     @div[style: (box-style 3 "#ddd")]{
@@ -79,12 +78,12 @@
       @a[href: "http://www.eecs.northwestern.edu/~robby/"]{Robby},
       @a[href: "http://www.cs.wpi.edu/~kfisler/"]{Kathi},
       @a[href: "http://www.cs.utah.edu/~mflatt/"]{Matthew},
-      @a[href: "http://www.cs.brown.edu/~sk/"]{Shriram}}))
+      @a[href: "http://www.cs.brown.edu/~sk/"]{Shriram}}})
 
 (define techreports
-  (page #:file "techreports/" #:part-of outreach+research
+  @page[#:file "techreports/" #:part-of outreach+research
         #:title "Technical Reports"
         #:extra-headers
         @meta[http-equiv: "refresh"
-              content: "2;url=http://plt-scheme.org/techreports/"]
-    "TODO"))
+              content: "2;url=http://plt-scheme.org/techreports/"]]{
+    TODO})
diff --git a/collects/meta/web/www/people.rkt b/collects/meta/web/www/people.rkt
index 8c972974b6..31a9c69f46 100644
--- a/collects/meta/web/www/people.rkt
+++ b/collects/meta/web/www/people.rkt
@@ -37,7 +37,7 @@
 
 (provide people)
 (define people
-  (page
+  @page{
     @p{@|ldquo|PLT@|rdquo| refers to the group that is the core of the Racket
        development team.  PLT consists of numerous people distributed across
        several different universities in the USA: @places}
@@ -52,4 +52,4 @@
     @p{Finally, Racket is supported by an band of volunteers who contribute not
        only code and documentation but also infectious enthusiasm@|mdash|too
        many to name but whose help and encouragement make this fun and
-       worthwhile.}))
+       worthwhile.}})