Index: trunk/Vanilla/config.yaml
===================================================================
--- trunk/Vanilla/config.yaml (revision 924)
+++ trunk/Vanilla/config.yaml (revision 929)
@@ -261,34 +261,39 @@
                 search_results:
                     label: Search Results
+    vanilla_assets:
+        label: Vanilla + Assets
+        base_path: templates/vanilla+assets
+        order: 509
+        notes: 
+            - Recent assets on Homepage in various sizes and formats
+            - lastn entries on Homepage with the first asset added to each as 70 pixel square
+            - Entry Detail with assets in entries
+        templates:
+            index:
+                home:
+                    label: Homepage
+                    outfile: index.html
+                    rebuild_me: 1
+            individual:
+                entry: 
+                    label: Entry
+                    mappings:
+                        entry_archive:
+                            archive_type: Individual
+            module:
+                wrapper:
+                    label: Wrapper
 
-# - Profiles + Userpics + Friending
-#     * Userpics
-#     * Profiles
-#     vanilla:
-#         label: 'Vanilla - Homepage + Entries'
-#         base_path: 'templates/vanilla'
-#         order: 100
-#         templates:
-# - Profiles
-#     * Friending
-#     vanilla:
-#         label: 'Vanilla - Homepage + Entries'
-#         base_path: 'templates/vanilla'
-#         order: 100
-#         templates:
+
 # - Rating
 #     * 1
 #     * 5 Star
 #     * -1, 0, 1
-#     vanilla:
-#         label: 'Vanilla - Homepage + Entries'
-#         base_path: 'templates/vanilla'
-#         order: 100
-#         templates:
+# - Profiles + Userpics + Friending
+#     * Userpics
+#     * Profiles
+#     * Friending
 # - Custom Fields
-# - Assets
-#   - recent assets
-#   - sizing
-
+# ----
 # - Widget & Widget Sets
 # - Logic
Index: trunk/Vanilla/README.txt
===================================================================
--- trunk/Vanilla/README.txt (revision 920)
+++ trunk/Vanilla/README.txt (revision 929)
@@ -56,4 +56,15 @@
         - Entry Response
 
+    8. Vanilla + Search & Tags
+        - Tag Cloud and Search Form on Homepage
+        - Entry Detail
+        - Page Detail
+        - Search Results Template
+
+    9. Vanilla + Assets
+        - Recent assets on Homepage in various sizes and formats
+        - lastn entries on Homepage with the first asset added to each as 70 pixel square
+        - Entry Detail with assets in entries
+    
 ## INSTALLATION ##
 
Index: trunk/Vanilla/templates/vanilla+search+tags/entry.mtml
===================================================================
--- trunk/Vanilla/templates/vanilla+search+tags/entry.mtml (revision 924)
+++ trunk/Vanilla/templates/vanilla+search+tags/entry.mtml (revision 929)
@@ -14,13 +14,9 @@
         <h3>Tags</h3>
         <ul>
-            <mt:EntryTags>
-            <li><a href="javascript:void(0)" onclick="location.href='<$mt:TagSearchLink encode_js="1"$>';return false;" rel="tag"><$mt:TagName$></a></li>
-            </mt:EntryTags>
-        </ul>
-        <ul>
-            <mt:EntryTags>
-            <li><a href="<$MTTagSearchLink$>&amp;IncludeBlogs=<$MTBlogID$>" rel="tag"><$MTTagName$></a></li>
-            </mt:EntryTags>
+        <mt:EntryTags>
+            <li><a href="<$MTTagSearchLink$>&amp;IncludeBlogs=<$MTBlogID$>" rel="tag nofollow"><$MTTagName$></a></li>
+        </mt:EntryTags>
         </ul>
     </mt:If>
+
 </mt:IncludeBlock>
Index: trunk/Vanilla/templates/vanilla+assets/home.mtml
===================================================================
--- trunk/Vanilla/templates/vanilla+assets/home.mtml (revision 929)
+++ trunk/Vanilla/templates/vanilla+assets/home.mtml (revision 929)
@@ -0,0 +1,40 @@
+<mt:IncludeBlock module="Wrapper">
+    
+    <mt:setvarblock name="html_head" append="1">
+        <style type="text/css" media="screen">            
+            .entry-thumbmail-image {
+                float: right;
+            }
+        </style>
+    </mt:setvarblock>
+
+    <mt:If tag="AssetCount">
+        <h3><__trans phrase="Recent Assets: 100 pixel height"></h3>
+        <mt:Assets type="image" lastn="10">
+        <a href="<$mt:AssetURL$>"><img src="<$mt:AssetThumbnailURL height="100"$>" alt="<$mt:AssetLabel$>" /></a>
+        </mt:Assets>
+
+        <h3><__trans phrase="Recent Assets: 50 pixel width"></h3>
+        <mt:Assets type="image" lastn="10">
+        <a href="<$mt:AssetURL$>"><img src="<$mt:AssetThumbnailURL width="50"$>" alt="<$mt:AssetLabel$>" /></a>
+        </mt:Assets>
+
+        <h3><__trans phrase="Recent Assets: 50 pixel square"></h3>
+        <mt:Assets type="image" lastn="10">
+        <a href="<$mt:AssetURL$>"><img src="<$mt:AssetThumbnailURL width="20" square="1"$>" alt="<$mt:AssetLabel$>" /></a>
+        </mt:Assets>
+    </mt:If>
+    
+
+    <h3><__trans phrase="Recent Entries (with the first asset added to each as 70 pixel square)"></h3>
+    <mt:Entries>
+        <h2><a href="<$mt:EntryPermalink$>"><$mt:EntryTitle$></a></h2>
+        <p><__trans phrase="By [_1] on [_2]" params="<$mt:EntryAuthorLink$>%%<$mt:EntryDate format="%x %X"$>"></p>
+        <mt:EntryAssets type="image" lastn="1" sort_order="ascend">
+        <a href="<$mt:EntryPermalink$>" class="entry-thumbmail-image"><img src="<$mt:AssetThumbnailURL width="70" square="1"$>" alt="<$mt:AssetLabel$>" /></a>
+        </mt:EntryAssets>
+        <p><$mt:EntryExcerpt$></p>
+        <p><em><__trans phrase="Read  <a href="[_1]">[_2]</a>" params="<$mt:EntryPermalink$>%%<$mt:EntryTitle$>"></em></p>
+    </mt:Entries>
+
+</mt:IncludeBlock>
Index: trunk/Vanilla/templates/vanilla+assets/wrapper.mtml
===================================================================
--- trunk/Vanilla/templates/vanilla+assets/wrapper.mtml (revision 929)
+++ trunk/Vanilla/templates/vanilla+assets/wrapper.mtml (revision 929)
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" id="sixapart-standard">
+<head>
+    <title><$mt:BlogName encode_html="1"$></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=<$mt:PublishCharset$>" />
+    <$mt:Var name="html_head"$>
+</head>
+<body>
+
+    <h1><a href="<$mt:BlogURL$>"><$mt:BlogName encode_html="1"$></a> + <__trans phrase="Assets"></h1>
+
+<!-- end header --><hr />
+
+
+    <$mt:Var name="contents"$>
+
+
+<!-- start footer --><hr />
+
+    <p><__trans phrase="_POWERED_BY"> and the Vanilla template set</p>
+
+</body>
+</html>
Index: trunk/Vanilla/templates/vanilla+assets/entry.mtml
===================================================================
--- trunk/Vanilla/templates/vanilla+assets/entry.mtml (revision 929)
+++ trunk/Vanilla/templates/vanilla+assets/entry.mtml (revision 929)
@@ -0,0 +1,12 @@
+<mt:IncludeBlock module="Wrapper">
+
+    <h1><$mt:EntryTitle$></h1>
+    <p><__trans phrase="By [_1] on [_2]" params="<$mt:EntryAuthorLink$>%%<$mt:EntryDate format="%x %X"$>"></p>
+    <mt:If tag="EntryBody">
+        <$mt:EntryBody$>
+    </mt:If>
+    <mt:If tag="EntryMore" convert_breaks="0">
+        <$mt:EntryMore$>
+    </mt:If>
+
+</mt:IncludeBlock>
Index: trunk/Vanilla/templates/vanilla+archives/entry_listing.mtml
===================================================================
--- trunk/Vanilla/templates/vanilla+archives/entry_listing.mtml (revision 922)
+++ trunk/Vanilla/templates/vanilla+archives/entry_listing.mtml (revision 929)
@@ -1,8 +1,6 @@
-<mt:IncludeBlock module="Wrapper">
+<mt:IncludeBlock module="wrapper">
 
     <h1><__trans phrase="[_1] Archives" params="<$mt:ArchiveTitle$>"></h1>
     
-    <p>archive_template: <mt:if name="archive_template">true</mt:if></p>
-
     <mt:Entries>
         <h2><a href="<$mt:EntryPermalink$>"><$mt:EntryTitle$></a></h2>
@@ -17,15 +15,10 @@
     
     <mt:If name="category_archive">
-        <mt:setvarblock name="foobar">
-            <h3><__trans phrase="[_1] Category-Monthly Archives" params="<$mt:ArchiveTitle$>"></h3>
-            <ul>
-            <mt:if name="category_monthly_archive">
-                <li><strong><a href="<$mt:CategoryArchiveLink$>"><__trans phrase='main "[_1]" category archive' params="<$mt:CategoryLabel$>"></a></strong></li>
-            </mt:if>
-            <mt:ArchiveList archive_type="Category-Monthly">
-                <li><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$></a></li>
-            </mt:ArchiveList>
-            </ul>
-        </mt:setvarblock>
+        <h3><__trans phrase="[_1] Category-Monthly Archives" params="<$mt:ArchiveTitle$>"></h3>
+        <ul>
+        <mt:ArchiveList archive_type="Category-Monthly">
+            <li><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$></a></li>
+        </mt:ArchiveList>
+        </ul>
     </mt:If>