diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index ff902849e..8ba8975e3 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -286,6 +286,10 @@
     <Content Include="Themes\TheAdmin\Views\Header.cshtml" />
     <Content Include="Themes\Web.config" />
     <Content Include="Themes\TheThemeMachine\Views\Layout.cshtml" />
+    <Content Include="Themes\TheThemeMachine\Views\Zone.cshtml" />
+    <Content Include="Themes\TheThemeMachine\Views\Zone-Sidebar.cshtml" />
+    <Content Include="Themes\TheThemeMachine\Views\Zone-Navigation.cshtml" />
+    <Content Include="Themes\TheThemeMachine\Views\Menu.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt b/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt
index d8acc4e9f..181a08857 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt
@@ -3,4 +3,5 @@ Author: jowall, mibach, loudej, heskew
 Description: It's a *really* good theme, yo.
 Version: 0.1
 Tags: Awesome
-Website: http://orchardproject.net
\ No newline at end of file
+Website: http://orchardproject.net
+Zones: Header, Navigation, Messages, Featured, ..., Footer
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Menu.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Menu.cshtml
new file mode 100644
index 000000000..c355a8231
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Menu.cshtml
@@ -0,0 +1,13 @@
+﻿<!-- Model is Model.Menu from the layout (Page.Menu) -->
+    <nav>
+        <ul>
+            <li class="first current"><a href="#">Home</a></li>
+            <li><a href="#">Blog</a></li>
+            <li><a href="#">About</a></li>
+            <li><a href="#">Full Page</a></li>
+            <li><a href="#">Image Page</a></li>
+            <li><a href="#">Gallery Page</a></li>
+            <li><a href="#">Nested Page</a></li>
+            <li class="last"><a href="#">Contact</a></li>
+        </ul>
+    </nav>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Zone-Navigation.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Zone-Navigation.cshtml
new file mode 100644
index 000000000..c17ffe4a1
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Zone-Navigation.cshtml
@@ -0,0 +1,3 @@
+﻿<div class="zone zone-@Model.ZoneName">
+@Display...
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Zone-Sidebar.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Zone-Sidebar.cshtml
new file mode 100644
index 000000000..c17ffe4a1
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Zone-Sidebar.cshtml
@@ -0,0 +1,3 @@
+﻿<div class="zone zone-@Model.ZoneName">
+@Display...
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Zone.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Zone.cshtml
new file mode 100644
index 000000000..55a41fe4a
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Zone.cshtml
@@ -0,0 +1,4 @@
+﻿
+<div class="zone zone-@Model.ZoneName">
+@Display...
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/draft.html b/src/Orchard.Web/Themes/TheThemeMachine/draft.html
index 92e06cb2b..e74666dcc 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/draft.html
+++ b/src/Orchard.Web/Themes/TheThemeMachine/draft.html
@@ -1,55 +1,90 @@
-﻿<!DOCTYPE html> 
+﻿@{
+    Model.Menu.Add(New.MenuItem(text:"foo", url:"http://orchardproject.net"));
+    Model.Navigation.Add(Model.Menu);
+    Model.FooterNavigation.Add(Model.Menu);
+}
+<!DOCTYPE html> 
 <html lang="en" class="static @Html.ClassForPage()"> 
 <head> 
-    <meta charset="utf-8" /> 
+    <meta charset="utf-8" />
+    <!-- use Model.Title instead -->
     <title>@Html.Title(WorkContext.CurrentSite.SiteName)</title> 
-    <script>(function(d){d.className="dyn "+d.className.substring(7,d.length);})(document.documentElement);</script> 
+    <script>(function(d){d.className="dyn"+d.className.substring(6,d.className.length);})(document.documentElement);</script> 
 </head> 
 <body>
     <div id="layout-wrapper">
         <header id="layout-header">
             <h1><a href="#">The Theme Machine</a></h1>
-            <!--zone: navigation -->
-            <nav>
-                <ul>
-                    <li class="first current"><a href="#">Home</a></li>
-                    <li><a href="#">Blog</a></li>
-                    <li><a href="#">About</a></li>
-                    <li><a href="#">Full Page</a></li>
-                    <li><a href="#">Image Page</a></li>
-                    <li><a href="#">Gallery Page</a></li>
-                    <li><a href="#">Nested Page</a></li>
-                    <li class="last"><a href="#">Contact</a></li>
-                </ul>
-            </nav>
-            <!--/zone: navigation -->
+@Display(Model.Header)
+            <!-- zone: header -->
+            <!-- /zone: header -->
+@Display(Model.Navigation)
+            <!-- zone: navigation 
+            <div class="zone-navigation zone">
+                <!-- Model.Menu -- >
+                <nav>
+                    <ul>
+                        <li class="first current"><a href="#">Home</a></li>
+                        <li><a href="#">Blog</a></li>
+                        <li><a href="#">About</a></li>
+                        <li><a href="#">Full Page</a></li>
+                        <li><a href="#">Image Page</a></li>
+                        <li><a href="#">Gallery Page</a></li>
+                        <li><a href="#">Nested Page</a></li>
+                        <li class="last"><a href="#">Contact</a></li>
+                    </ul>
+                </nav>
+                <!-- /widget: menu -- >
+            </div>
+            /zone: navigation -->
         </header>
-        <section>
-          <article>
-            <header>
-              <h1><a href="#">Title</a></h1>
-            </header>
-            <section>
-              <p>Lorem ipsum...</p>
+        <!-- zone: messages -->
+        <!-- /zone: messages -->
+        <!-- zone: featured -->
+        <div class="zone-featured zone">
+            <article class="featured-blogpost">
+                <header>
+                    <img />
+<!-- // example // -->
+@if(HasText(Model.Title)) {
+                    <h1>@Model.Title</h1>
+}
+else {
+                    <div>something</div>
+}
+                </header>
+                <p>Featured blog post's summary...</p>
+            </article>
+        </div>
+        <!-- /zone: featured -->
+
+
+            <section class="posts-recent">
+                <ul>
+                    <li class="first">
+                        <article>
+                            <header>
+                                <h1>Another recent post title</h1>
+                            </header>
+                            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent magna ante, accumsan at blandit et, posuere imperdiet sapien. Praesent condimentum laoreet justo non semper. Cras molestie fermentum turpis, in ornare eros mollis non. Sed a ligula sit amet mauris ultrices hendrerit ac vitae quam. Integer sit amet lorem vitae velit accumsan suscipit. Nulla mi nulla, congue eget euismod eget, ultrices in mauris. Mauris leo turpis, malesuada mattis feugiat ut, convallis in neque. Maecenas iaculis consequat interdum. Sed fermentum dolor quis ante interdum in sollicitudin lorem sollicitudin. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
+                        </article>
+                    </li>
+                    <li class="last">
+                        <article>
+                            <header>
+                                <h1>Another recent post title</h1>
+                            </header>
+                            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent magna ante, accumsan at blandit et, posuere imperdiet sapien. Praesent condimentum laoreet justo non semper. Cras molestie fermentum turpis, in ornare eros mollis non. Sed a ligula sit amet mauris ultrices hendrerit ac vitae quam. Integer sit amet lorem vitae velit accumsan suscipit. Nulla mi nulla, congue eget euismod eget, ultrices in mauris. Mauris leo turpis, malesuada mattis feugiat ut, convallis in neque. Maecenas iaculis consequat interdum. Sed fermentum dolor quis ante interdum in sollicitudin lorem sollicitudin. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
+                        </article>
+                    </li>
+                </ul>
             </section>
-          </article>
-          <article>
-            <header>
-              <h1><a href="#">Title</a></h1>
-            </header>
-            <section>
-              <p>Lorem ipsum...</p>
-            </section>
-          </article>
-          <article>
-            <header>
-              <h1><a href="#">Title</a></h1>
-            </header>
-            <section>
-              <p>Lorem ipsum...</p>
-            </section>
-          </article>
-        </section>
+            <div class="primary-zone zone">
+            </div>
+            <div class="secondary-zone zone">
+            </div>
+        </div>
+
         <footer>
           <p>Copyright © 2008 All Rights</p>
         </footer>
