Index: branches/release-33/default_templates/trackbacks.mtml
===================================================================
--- branches/release-33/default_templates/trackbacks.mtml (revision 1463)
+++ branches/release-33/default_templates/trackbacks.mtml (revision 1709)
@@ -1,10 +1,17 @@
+<mt:ignore><!-- Display TrackBacks for the entry/page or TrackBack details if TrackBacks are being accepted --></mt:ignore>
 <MTIfPingsActive>
 <div id="trackbacks" class="trackbacks">
     <h2 class="trackbacks-header"><__trans phrase="[_1] TrackBacks" params="<$MTEntryTrackbackCount$>"></h2>
+
+
+    <mt:ignore><!-- Display TrackBack details if TrackBacks are being accepted --></mt:ignore>
     <MTIfPingsAccepted>
     <div class="trackbacks-info">
-        <p><__trans phrase="TrackBack URL for this entry: <span id="trackbacks-link">[_1]</span>" params="<$MTEntryTrackbackLink$>"></p>
+        <p><__trans phrase="Entry TrackBack URL: <span id="trackbacks-link">[_1]</span>" params="<$MTEntryTrackbackLink$>"></p>
     </div>
     </MTIfPingsAccepted>
+
+
+    <mt:ignore><!-- Display TrackBacks --></mt:ignore>
     <MTPings>
         <MTPingsHeader>
Index: branches/release-33/default_templates/archive_index.mtml
===================================================================
--- branches/release-33/default_templates/archive_index.mtml (revision 1463)
+++ branches/release-33/default_templates/archive_index.mtml (revision 1709)
@@ -1,118 +1,174 @@
-<MTSetVar name="body_class" value="mt-archive-index">
 <MTSetVar name="archive_index" value="1">
-<MTSetVar name="module_about_context" value="1">
-<MTSetVarBlock name="page_title"><__trans phrase="Archives"></MTSetVarBlock>
-<MTSetVarBlock name="title"><$MTBlogName encode_html="1"$>: <$MTGetVar name="page_title"$></MTSetVarBlock>
+<!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><$MTBlogName encode_html="1"$>: <__trans phrase="Archives"></title>
+    <$mt:include module="<__trans phrase="HTML Head">"$>
+</head>
+<body class="mt-archive-index <$MTVar name="page_layout"$>">
+    <div id="container">
+        <div id="container-inner">
 
-<$MTInclude module="<__trans phrase="Header">"$>
 
-<h1 id="page-title" class="archive-title"><$MTGetVar name="page_title"$></h1>
+            <$mt:include module="<__trans phrase="Banner Header">"$>
 
+
+            <div id="content">
+                <div id="content-inner">
+
+
+                    <div id="alpha">
+                        <div id="alpha-inner">
+
+                            <h1 id="page-title" class="archive-title"><__trans phrase="Archives"></h1>
+
+<mt:ignore>
+    <!-- List of monthly archives, if monthly archives are enabled -->
+</mt:ignore>
+<MTIfArchiveTypeEnabled archive_type="Monthly">
+                            <div class="archive-monthly archive-date-based archive">
+    <MTArchiveList archive_type="Monthly">
+        <MTArchiveListHeader>
+                                <h2 class="archive-header"><__trans phrase="Monthly Archives"></h2>
+                                <div class="archive-content">
+                                    <ul class="archive-list">
+        </MTArchiveListHeader>
+                                        <li class="archive-list-item"><a href="<$MTArchiveLink$>"><$MTArchiveTitle$></a></li>
+        <MTArchiveListFooter>
+                                    </ul>
+                                </div>
+        </MTArchiveListFooter>
+    </MTArchiveList>
+                            </div>
+</MTIfArchiveTypeEnabled>
+
+
+<mt:ignore>
+    <!-- List of category archives, if category archives are enabled -->
+</mt:ignore>
+<MTIfArchiveTypeEnabled archive_type="Category">
+                            <div class="archive-category archive">
+                                <h2 class="archive-header"><__trans phrase="Categories"></h2>
+                                <div class="archive-content">
+    <MTTopLevelCategories>
+        <MTSubCatIsFirst>
+                                    <ul class="archive-list">
+        </MTSubCatIsFirst>
+        <MTIfNonZero tag="MTCategoryCount">
+                                        <li class="archive-list-item"><a href="<$MTCategoryArchiveLink$>" title="<$MTCategoryDescription$>"><$MTCategoryLabel$></a>
+        <MTElse>
+                                        <li class="archive-list-item"><$MTCategoryLabel$>
+        </MTIfNonZero>
+        <MTSubCatsRecurse>
+                                        </li>
+        <MTSubCatIsLast>
+                                    </ul>
+        </MTSubCatIsLast>
+    </MTTopLevelCategories>
+                                </div>
+                            </div>
+</MTIfArchiveTypeEnabled>
+
+
+<mt:ignore>
+    <!-- List of author archives, if category author are enabled -->
+    <MTIfArchiveTypeEnabled archive_type="Author">
+                                <div class="archive-author archive">
+        <MTArchiveList archive_type="Author">
+            <MTArchiveListHeader>
+                                    <h2 class="archive-header"><__trans phrase="Author Archives"></h2>
+                                    <div class="archive-content">
+                                        <ul class="archive-list">
+            </MTArchiveListHeader>
+                                            <li class="archive-list-item"><a href="<$MTArchiveLink$>"><$MTArchiveTitle$></a></li>
+            <MTArchiveListFooter>
+                                        </ul>
+                                    </div>
+            </MTArchiveListFooter>
+        </MTArchiveList>
+                                </div>
+    </MTIfArchiveTypeEnabled>
+</mt:ignore>
+
+
+<mt:ignore>
+    <!-- List of category archives by month, if category archives are enabled -->
+    <MTIfArchiveTypeEnabled archive_type="Category-Monthly">
+                                <div class="archive-category-monthly archive">
+        <MTArchiveList archive_type="Category-Monthly">
+            <MTArchiveListHeader>
+                                    <h2 class="archive-header"><__trans phrase="Category Monthly Archives"></h2>
+                                    <div class="archive-content">
+                                        <ul class="archive-list">
+            </MTArchiveListHeader>
+                                            <li class="archive-list-item"><a href="<$MTArchiveLink$>"><$MTArchiveTitle$></a></li>
+            <MTArchiveListFooter>
+                                        </ul>
+                                    </div>
+            </MTArchiveListFooter>
+        </MTArchiveList>
+                                </div>
+    </MTIfArchiveTypeEnabled>
+</mt:ignore>
+
+
+<mt:ignore>
+    <!-- List of author archives, if category archives are enabled -->
+    <MTIfArchiveTypeEnabled archive_type="Author-Monthly">
+                                <div class="archive-author-monthly archive">
+        <MTArchiveList archive_type="Author-Monthly">
+            <MTArchiveListHeader>
+                                    <h2 class="archive-header"><__trans phrase="Author Monthly Archives"></h2>
+                                    <div class="archive-content">
+                                        <ul class="archive-list">
+            </MTArchiveListHeader>
+                                            <li class="archive-list-item"><a href="<$MTArchiveLink$>"><$MTArchiveTitle$></a></li>
+            <MTArchiveListFooter>
+                                        </ul>
+                                    </div>
+            </MTArchiveListFooter>
+        </MTArchiveList>
+                                </div>
+    </MTIfArchiveTypeEnabled>
+</mt:ignore>
+
+
+<mt:ignore>
+    <!-- List of entry archives, if entry archives are enabled -->
 <MTIfArchiveTypeEnabled archive_type="Individual">
-<div class="archive-individual archive-date-based archive">
+                            <div class="archive-individual archive-date-based archive">
     <MTArchiveList archive_type="Individual">
         <MTArchiveListHeader>
-    <div class="archive-content">
-        <ul class="archive-list">
+                                <div class="archive-content">
+                                    <ul class="archive-list">
         </MTArchiveListHeader>
-            <li class="archive-list-item"><$MTArchiveDate format="%Y.%m.%d"$>: <a href="<$MTArchiveLink$>"><$MTArchiveTitle$></a></li>
+                                        <li class="archive-list-item"><$MTArchiveDate format="%Y.%m.%d"$>: <a href="<$MTArchiveLink$>"><$MTArchiveTitle$></a></li>
         <MTArchiveListFooter>
-        </ul>
-    </div>
+                                    </ul>
+                                </div>
         </MTArchiveListFooter>
     </MTArchiveList>
-</div>
+                            </div>
 </MTIfArchiveTypeEnabled>
+</mt:ignore>
 
-<MTIfArchiveTypeEnabled archive_type="Monthly">
-<div class="archive-monthly archive-date-based archive">
-    <MTArchiveList archive_type="Monthly">
-        <MTArchiveListHeader>
-    <h2 class="archive-header"><__trans phrase="Monthly Archives"></h2>
-    <div class="archive-content">
-        <ul class="archive-list">
-        </MTArchiveListHeader>
-            <li class="archive-list-item"><a href="<$MTArchiveLink$>"><$MTArchiveTitle$></a></li>
-        <MTArchiveListFooter>
-        </ul>
+
+                        </div>
+                    </div>
+
+
+                    <$MTInclude module="<__trans phrase="Sidebar">"$>
+
+
+                </div>
+            </div>
+
+
+            <$mt:include module="<__trans phrase="Banner Footer">"$>
+
+
+        </div>
     </div>
-        </MTArchiveListFooter>
-    </MTArchiveList>
-</div>
-</MTIfArchiveTypeEnabled>
-
-<MTIfArchiveTypeEnabled archive_type="Category">
-<div class="archive-category archive">
-    <h2 class="archive-header"><__trans phrase="Categories"></h2>
-    <div class="archive-content">
-    <MTTopLevelCategories>
-        <MTSubCatIsFirst>
-        <ul class="archive-list">
-        </MTSubCatIsFirst>
-        <MTIfNonZero tag="MTCategoryCount">
-            <li class="archive-list-item"><a href="<$MTCategoryArchiveLink$>" title="<$MTCategoryDescription$>"><$MTCategoryLabel$></a>
-        <MTElse>
-            <li class="archive-list-item"><$MTCategoryLabel$>
-        </MTIfNonZero>
-        <MTSubCatsRecurse>
-            </li>
-        <MTSubCatIsLast>
-        </ul>
-        </MTSubCatIsLast>
-    </MTTopLevelCategories>
-    </div>
-</div>
-</MTIfArchiveTypeEnabled>
-
-<MTIfArchiveTypeEnabled archive_type="Author">
-<div class="archive-author archive">
-    <MTArchiveList archive_type="Author">
-        <MTArchiveListHeader>
-    <h2 class="archive-header"><__trans phrase="Author Archives"></h2>
-    <div class="archive-content">
-        <ul class="archive-list">
-        </MTArchiveListHeader>
-            <li class="archive-list-item"><a href="<$MTArchiveLink$>"><$MTArchiveTitle$></a></li>
-        <MTArchiveListFooter>
-        </ul>
-    </div>
-        </MTArchiveListFooter>
-    </MTArchiveList>
-</div>
-</MTIfArchiveTypeEnabled>
-
-<MTIfArchiveTypeEnabled archive_type="Category-Monthly">
-<div class="archive-category-monthly archive">
-    <MTArchiveList archive_type="Category-Monthly">
-        <MTArchiveListHeader>
-    <h2 class="archive-header"><__trans phrase="Category Monthly Archives"></h2>
-    <div class="archive-content">
-        <ul class="archive-list">
-        </MTArchiveListHeader>
-            <li class="archive-list-item"><a href="<$MTArchiveLink$>"><$MTArchiveTitle$></a></li>
-        <MTArchiveListFooter>
-        </ul>
-    </div>
-        </MTArchiveListFooter>
-    </MTArchiveList>
-</div>
-</MTIfArchiveTypeEnabled>
-
-<MTIfArchiveTypeEnabled archive_type="Author-Monthly">
-<div class="archive-author-monthly archive">
-    <MTArchiveList archive_type="Author-Monthly">
-        <MTArchiveListHeader>
-    <h2 class="archive-header"><__trans phrase="Author Monthly Archives"></h2>
-    <div class="archive-content">
-        <ul class="archive-list">
-        </MTArchiveListHeader>
-            <li class="archive-list-item"><a href="<$MTArchiveLink$>"><$MTArchiveTitle$></a></li>
-        <MTArchiveListFooter>
-        </ul>
-    </div>
-        </MTArchiveListFooter>
-    </MTArchiveList>
-</div>
-</MTIfArchiveTypeEnabled>
-
-<$MTInclude module="<__trans phrase="Footer">"$>
+</body>
+</html>
Index: branches/release-33/default_templates/sidebar.mtml
===================================================================
--- branches/release-33/default_templates/sidebar.mtml (revision 1195)
+++ branches/release-33/default_templates/sidebar.mtml (revision 1709)
@@ -1,12 +1,28 @@
+<mt:ignore><!-- 
+#
+#  The sidebar is made up of one or two columns.
+#  For 2-column designs, just beta.
+#  For 3-column designs, beta and gamma.
+#
+--></mt:ignore>
+
+
 <div id="beta">
     <div id="beta-inner">
+
 <mt:if name="page_columns" eq="2">
+    <mt:ignore><!-- Use the 2-column layout Sidebar if page layout is layout-wt or layout-tw. --></mt:ignore>
     <$mt:WidgetSet name="<__trans phrase="2-column layout - Sidebar">"$>
 <mt:else name="page_columns" eq="3">
+    <mt:ignore><!-- Use the 3-column layout Primary Sidebar if page layout is layout-wtt or layout-twt. --></mt:ignore>
     <$mt:WidgetSet name="<__trans phrase="3-column layout - Primary Sidebar">"$>
 </mt:if>
+
     </div>
 </div>
+
+
 <mt:if name="page_columns" eq="3">
+    <mt:ignore><!-- Use the 3-column layout Secondary Sidebar if page layout is layout-wtt or layout-twt. --></mt:ignore>
 <div id="gamma">
     <div id="gamma-inner">
Index: branches/release-33/default_templates/main_index.mtml
===================================================================
--- branches/release-33/default_templates/main_index.mtml (revision 1463)
+++ branches/release-33/default_templates/main_index.mtml (revision 1709)
@@ -1,17 +1,52 @@
-<MTSetVar name="main_index" value="1">
-<mt:setvarblock name="html_head">
+<$mt:setvar name="main_index" value="1"$>
+<!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><$MTBlogName encode_html="1"$></title>
+    <$mt:include module="<__trans phrase="HTML Head">"$>
     <link rel="EditURI" type="application/rsd+xml" title="RSD" href="<$MTLink template="rsd"$>" />
-</mt:setvarblock>
-<MTSetVarBlock name="title"><$MTBlogName encode_html="1"$></MTSetVarBlock>
+</head>
+<body class="mt-main-index <$MTVar name="page_layout"$>">
+    <div id="container">
+        <div id="container-inner">
 
-<$MTInclude module="<__trans phrase="Header">" body_class="mt-main-index"$>
 
+            <$mt:include module="<__trans phrase="Banner Header">"$>
+
+
+            <div id="content">
+                <div id="content-inner">
+
+
+                    <div id="alpha">
+                        <div id="alpha-inner">
 <MTEntries>
-    <$MTInclude module="<__trans phrase="Entry Summary">"$>
+                            <mt:ignore><!-- Use the Entry Summary module for each entry published on this page --></mt:ignore>
+                            <$mt:include module="Entry Summary"$>
 </MTEntries>
 
-<div class="content-nav">
-    <a href="<$MTLink template="archive_index"$>"><__trans phrase="Archives"></a>
-</div>
 
-<$MTInclude module="<__trans phrase="Footer">"$>
+                            <div class="content-nav">
+                                <a href="<$MTLink template="archive_index"$>"><__trans phrase="Archives"></a>
+                            </div>
+
+
+                        </div>
+                    </div>
+
+
+                    <$MTInclude module="<__trans phrase="Sidebar">"$>
+
+
+                </div>
+            </div>
+
+
+            <$mt:include module="<__trans phrase="Banner Footer">"$>
+
+
+        </div>
+    </div>
+</body>
+</html>
Index: branches/release-33/default_templates/page.mtml
===================================================================
--- branches/release-33/default_templates/page.mtml (revision 1463)
+++ branches/release-33/default_templates/page.mtml (revision 1709)
@@ -1,18 +1,67 @@
-<MTSetVar name="body_class" value="mt-archive-listing mt-page-archive">
-<MTIfCommentsAccepted><$MTSetVar name="body_onload" value="individualArchivesOnLoad(commenter_name)"$></MTIfCommentsAccepted>
-<MTSetVarBlock name="page_title"><$MTPageTitle$></MTSetVarBlock>
-<MTSetVarBlock name="title"><$MTGetVar name="page_title"$> - <$MTBlogName encode_html="1"$></MTSetVarBlock>
-<MTSetVarBlock name="html_head">
-    <MTIfPingsAccepted><$MTEntryTrackbackData$></MTIfPingsAccepted>
+<!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><$MTPageTitle encode_html="1"$> - <$MTBlogName encode_html="1"$></title>
+    <$mt:include module="<__trans phrase="HTML Head">"$>
+    <$MTEntryTrackbackData$>
     <MTIfCommentsAccepted><script type="text/javascript" src="<$MTLink template="javascript"$>"></script></MTIfCommentsAccepted>
-</MTSetVarBlock>
+</head>
+<body class="mt-page-archive <$MTVar name="page_layout"$>" onload="individualArchivesOnLoad(commenter_name)">
+    <div id="container">
+        <div id="container-inner">
 
-<$MTInclude module="<__trans phrase="Header">"$>
 
-<$MTInclude module="<__trans phrase="Page Detail">"$>
+            <$mt:include module="<__trans phrase="Banner Header">"$>
 
-<$MTInclude module="<__trans phrase="TrackBacks">"$>
 
-<$MTInclude module="<__trans phrase="Comments">"$>
+            <div id="content">
+                <div id="content-inner">
 
-<$MTInclude module="<__trans phrase="Footer">"$>
+
+                    <div id="alpha">
+                        <div id="alpha-inner">
+
+
+                            <div id="page-<$MTPageID$>" class="page-asset asset">
+                                <div class="asset-header">
+                                    <h1 id="page-title" class="asset-name"><$MTPageTitle$></h1>
+                                </div>
+                                <div class="asset-content">
+<MTIfNonEmpty tag="PageBody">
+                                    <div class="asset-body">
+                                        <$MTPageBody$>
+                                    </div>
+</MTIfNonEmpty>
+<MTIfNonEmpty tag="PageMore">
+                                    <div id="more" class="asset-more">
+                                        <$MTPageMore$>
+                                    </div>
+</MTIfNonEmpty>
+                                </div>
+                                <div class="asset-footer"></div>
+                            </div>
+
+
+                    <$MTInclude module="<__trans phrase="Trackbacks">"$>
+                    <$MTInclude module="<__trans phrase="Comments">"$>
+
+
+                        </div>
+                    </div>
+
+
+                    <$MTInclude module="<__trans phrase="Sidebar">"$>
+
+
+                </div>
+            </div>
+
+
+            <$mt:include module="<__trans phrase="Banner Footer">"$>
+
+
+        </div>
+    </div>
+</body>
+</html>
Index: branches/release-33/default_templates/banner_header.mtml
===================================================================
--- branches/release-33/default_templates/banner_header.mtml (revision 1709)
+++ branches/release-33/default_templates/banner_header.mtml (revision 1709)
@@ -0,0 +1,14 @@
+<div id="header">
+    <div id="header-inner">
+        <div id="header-content">
+<mt:ignore><!-- Use h1 and h2 html tags on the main index of the blog as the title, use divs on all other pages where there are page titles. --></mt:ignore>
+<MTIf name="main_index">
+            <h1 id="header-name"><a href="<$MTBlogURL$>" accesskey="1"><$MTBlogName encode_html="1"$></a></h1>
+            <h2 id="header-description"><$MTBlogDescription$></h2>
+<MTElse>
+            <div id="header-name"><a href="<$MTBlogURL$>" accesskey="1"><$MTBlogName encode_html="1"$></a></div>
+            <div id="header-description"><$MTBlogDescription$></div>
+</MTIf>
+        </div>
+    </div>
+</div>
Index: branches/release-33/default_templates/entry_summary.mtml
===================================================================
--- branches/release-33/default_templates/entry_summary.mtml (revision 1423)
+++ branches/release-33/default_templates/entry_summary.mtml (revision 1709)
@@ -1,7 +1,20 @@
-<MTIfPingsAccepted><$MTEntryTrackbackData$></MTIfPingsAccepted>
+<$MTEntryTrackbackData$>
 <div id="entry-<$MTEntryID$>" class="entry-asset asset hentry">
     <div class="asset-header">
         <h2 class="asset-name entry-title"><a href="<$MTEntryPermalink$>"><$MTEntryTitle$></a></h2>
-        <$MTInclude module="<__trans phrase="Entry Metadata">"$>
+        <div class="asset-meta">
+            <span class="byline">
+<MTIfNonEmpty tag="EntryAuthorDisplayName">
+                <__trans phrase="By [_1] on [_2]" params="<span class="vcard author"><$MTEntryAuthorLink show_hcard="1"$></span>%%<abbr class="published" title="<$MTEntryDate format_name="iso8601"$>"><$MTEntryDate format="%x %X"$></abbr>">
+<MTElse>
+                <abbr class="published" title="<$MTEntryDate format_name="iso8601"$>"><$MTEntryDate format="%x %X"$></abbr>
+</MTIfNonEmpty>
+            </span>
+            <span class="separator">|</span> <a class="permalink" rel="bookmark" href="<$MTEntryPermalink$>"><__trans phrase="Permalink"></a>
+<MTUnless name="hide_counts" eq="1">
+            <MTIfCommentsActive><span class="separator">|</span> <a href="<$MTEntryPermalink$>#comments"><__trans phrase="Comments ([_1])" params="<$MTEntryCommentCount$>"></a></MTIfCommentsActive>
+            <MTIfPingsActive><span class="separator">|</span> <a href="<$MTEntryPermalink$>#trackback"><__trans phrase="TrackBacks ([_1])" params="<$MTEntryTrackbackCount$>"></a></MTIfPingsActive>
+</MTUnless>
+        </div>
     </div>
     <div class="asset-content entry-content">
@@ -11,7 +24,15 @@
         </div>
 </MTIfNonEmpty>
-<MTIfTagSearch>
-        <$MTInclude module="<__trans phrase="Tags">"$>
-</MTIfTagSearch>
+<mt:if name="entry_archive">
+    <MTEntryIfTagged>
+        <div class="entry-tags">
+            <h4 class="entry-tags-header"><__trans phrase="Tags"><span class="delimiter">:</span></h4>
+            <ul class="entry-tags-list">
+                <mt:setvarblock name="blog_id"><$MTBlogID$></mt:setvarblock>
+                <li class="entry-tag"><MTEntryTags glue='<span class="delimiter">,</span></li> <li class="entry-tag">'><a href="<$MTTagSearchLink$>" rel="tag"><$MTTagName$></a></MTEntryTags></li>
+            </ul>
+        </div>
+    </MTEntryIfTagged>
+</mt:if>
 <MTIfNonEmpty tag="EntryMore" convert_breaks="0">
         <div class="asset-more-link">
Index: branches/release-33/default_templates/comment_response.mtml
===================================================================
--- branches/release-33/default_templates/comment_response.mtml (revision 1463)
+++ branches/release-33/default_templates/comment_response.mtml (revision 1709)
@@ -1,19 +1,58 @@
+<!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>
+
+
 <MTIf name="body_class" eq="mt-comment-confirmation">
+<mt:ignore><!-- Success message when comment has been submitted --></mt:ignore>
     <MTSetVar name="page_title" value="<__trans phrase="Confirmation...">">
     <MTSetVar name="message" value="<__trans phrase="Your comment has been submitted!">">
 <MTElse name="body_class" eq="mt-comment-pending">
+<mt:ignore><!-- Pending message when comment is being held for review --></mt:ignore>
     <MTSetVar name="page_title" value="<__trans phrase="Thank you for commenting.">">
     <MTSetVar name="message" value="<__trans phrase="Your comment has been received and held for approval by the blog owner.">">
 <MTElse name="body_class" eq="mt-comment-error">
+<mt:ignore><!-- Error message when comment submission fails --></mt:ignore>
     <MTSetVar name="page_title" value="<__trans phrase="Comment Submission Error">">
     <MTSetVarBlock name="message"><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$MTErrorMessage$>"></MTSetVarBlock>
 </MTIf>
-<MTSetVarBlock name="title"><$MTBlogName encode_html="1"$>: <$MTVar name="page_title"$></MTSetVarBlock>
 
-<$MTInclude module="<__trans phrase="Header">"$>
 
-<h1 id="page-title"><$MTVar name="page_title"$></h1>
-<$MTVar name="message"$>
-<p><__trans phrase="Return to the <a href="[_1]">original entry</a>." params="<$MTEntryLink$>"></p>
+    <title><$MTBlogName encode_html="1"$>: <$MTVar name="page_title"$></title>
+    <$mt:include module="<__trans phrase="HTML Head">"$>
+</head>
+<body class="<$mt:var name="body_class"$> <$MTVar name="page_layout"$>">
+    <div id="container">
+        <div id="container-inner">
 
-<$MTInclude module="<__trans phrase="Footer">"$>
+
+            <$mt:include module="<__trans phrase="Banner Header">"$>
+
+
+            <div id="content">
+                <div id="content-inner">
+
+
+                    <div id="alpha">
+                        <div id="alpha-inner">
+                            <h1 id="page-title"><$MTVar name="page_title"$></h1>
+                            <$MTVar name="message"$>
+                        </div>
+                    </div>
+
+
+                    <$MTInclude module="<__trans phrase="Sidebar">"$>
+
+
+                </div>
+            </div>
+
+
+            <$mt:include module="<__trans phrase="Banner Footer">"$>
+
+
+        </div>
+    </div>
+</body>
+</html>
Index: branches/release-33/default_templates/banner_footer.mtml
===================================================================
--- branches/release-33/default_templates/banner_footer.mtml (revision 1709)
+++ branches/release-33/default_templates/banner_footer.mtml (revision 1709)
@@ -0,0 +1,18 @@
+<div id="footer">
+    <div id="footer-inner">
+        <div id="footer-content">
+            <div class="widget-powered widget">
+                <div class="widget-content">
+                    <__trans phrase="_POWERED_BY">
+                </div>
+            </div>
+<MTBlogIfCCLicense>
+            <div class="widget-creative-commons widget">
+                <div class="widget-content">
+                    <__trans phrase="This blog is licensed under a <a href="[_1]">Creative Commons License</a>." params="<$MTBlogCCLicenseURL$>">
+                </div>
+            </div>
+</MTBlogIfCCLicense>
+        </div>
+    </div>
+</div>
Index: branches/release-33/default_templates/html_head.mtml
===================================================================
--- branches/release-33/default_templates/html_head.mtml (revision 1709)
+++ branches/release-33/default_templates/html_head.mtml (revision 1709)
@@ -0,0 +1,6 @@
+<meta http-equiv="Content-Type" content="text/html; charset=<$MTPublishCharset$>" />
+<meta name="generator" content="<$MTProductName version="1"$>" />
+<link rel="stylesheet" href="<$MTLink template="styles"$>" type="text/css" />
+<link rel="start" href="<$MTBlogURL$>" title="Home" />
+<link rel="alternate" type="application/atom+xml" title="Recent Entries" href="<$MTLink template="feed_recent"$>" />
+<$MTCCLicenseRDF$>
Index: branches/release-33/default_templates/comments.mtml
===================================================================
--- branches/release-33/default_templates/comments.mtml (revision 1350)
+++ branches/release-33/default_templates/comments.mtml (revision 1709)
@@ -1,7 +1,8 @@
+<mt:ignore><!-- Display comments for the entry/page or commenting form if entry/page is accepting comments --></mt:ignore>
 <MTIfCommentsActive>
 <div id="comments" class="comments">
-    <MTIf name="comment_preview_template">
-    <$MTInclude module="<__trans phrase="Comment Form">"$>
-    </MTIf>
+
+
+    <mt:ignore><!-- Display comments --></mt:ignore>
     <MTComments>
         <MTCommentsHeader>
@@ -9,12 +10,96 @@
     <div class="comments-content">
         </MTCommentsHeader>
-        <$MTInclude module="<__trans phrase="Comment Detail">"$>
+        <div class="comment"<MTIfArchiveTypeEnabled archive_type="Individual"> id="comment-<$MTCommentID$>"</MTIfArchiveTypeEnabled>>
+            <div class="inner">
+                <div class="comment-header">
+                    <div class="asset-meta">
+                        <span class="byline">
+                            <__trans phrase="By"> <span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span><MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty>
+                            <MTCommentParent>
+                            <__trans phrase="replied to"> <a href="#comment-<$MTCommentID$>"><$MTCommentAuthor$></a>
+                            </MTCommentParent>
+                            <__trans phrase="on"> <a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>
+                            <MTIfCommentsAccepted> | <$MTCommentReplyLink$></MTIfCommentsAccepted>
+                        </span>
+                    </div>
+                </div>
+                <div class="comment-content">
+                    <$MTCommentBody$>
+                </div>
+            </div>
+        </div>
         <MTCommentsFooter>
     </div>
         </MTCommentsFooter>
     </MTComments>
-    <MTUnless name="comment_preview_template">
-    <$MTInclude module="<__trans phrase="Comment Form">"$>
-    </MTUnless>
+
+
+    <mt:ignore><!-- Display commenting form if entry/page is accepting comments --></mt:ignore>
+    <MTIfCommentsAccepted>
+    <div class="comments-open" id="comments-open">
+        <h2 class="comments-open-header"><__trans phrase="Leave a comment"></h2>
+        <div class="comments-open-content">
+
+
+        <mt:ignore><!-- Display greeting for users if blog allows users to register locally --></mt:ignore>
+        <MTIfRegistrationAllowed>
+            <div id="comment-form-external-auth">
+                <script type="text/javascript">
+                /* <![CDATA[ */
+                writeCommenterGreeting(commenter_name, <$MTEntryID$>, <$MTEntryBlogID$>, commenter_id, commenter_url);
+                /* ]]> */
+                </script>
+            </div>
+        </MTIfRegistrationAllowed>
+
+
+            <form method="post" action="<$MTCGIPath$><$MTCommentScript$>" name="comments_form" id="comments-form" onsubmit="if (this.bakecookie.checked) rememberMe(this)">
+                <input type="hidden" name="static" value="1" />
+                <input type="hidden" name="entry_id" value="<$MTEntryID$>" />
+                <input type="hidden" name="__lang" value="<$MTBlogLanguage$>" />
+                <input type="hidden" name="parent_id" value="<MTIf name="comment_preview_template"><$MTCommentParentID$></MTIf>" id="comment-parent-id" />
+                <div id="comments-open-data">
+                    <div id="comment-form-name">
+                        <label for="comment-author"><__trans phrase="Name"></label>
+                        <input id="comment-author" name="author" size="30" value="" />
+                    </div>
+                    <div id="comment-form-email">
+                        <label for="comment-email"><__trans phrase="Email Address"></label>
+                        <input id="comment-email" name="email" size="30" value="" />
+                    </div>
+                    <div id="comment-form-url">
+                        <label for="comment-url"><__trans phrase="URL"></label>
+                        <input id="comment-url" name="url" size="30" value="" />
+                    </div>
+                    <div id="comment-form-remember-me">
+                        <label for="comment-bake-cookie"><input type="checkbox" id="comment-bake-cookie" name="bakecookie" onclick="if (!this.checked) forgetMe(document.comments_form)" value="1" />
+                            <__trans phrase="Remember personal info?"></label>
+                    </div>
+                    <div id="comment-form-reply">
+                        <label for="comment-reply" id="comment-reply-label"><input type="checkbox" id="comment-reply" name="comment_reply" value="" onclick="setCommentParentID();" />
+                            <__trans phrase="Replying to"></label>
+                    </div>
+                </div>
+                <div id="comments-open-text">
+                    <label for="comment-text"><__trans phrase="Comments"> <MTIfAllowCommentHTML><__trans phrase="(You may use HTML tags for style)"></MTIfAllowCommentHTML></label>
+                    <textarea id="comment-text" name="text" rows="15" cols="50"></textarea>
+                </div>
+                <MTIfNonEmpty tag="MTCaptchaFields">
+                <MTIfCommentsAccepted><MTIfRegistrationAllowed><MTElse><$MTCaptchaFields$></MTIfRegistrationAllowed></MTIfCommentsAccepted>
+                <div id="comments-open-captcha">
+                </div>
+                </MTIfNonEmpty>
+                <div id="comments-open-footer">
+                    <input type="submit" accesskey="v" name="preview" id="comment-preview" value="<__trans phrase="Preview">" />
+                    <input type="submit" accesskey="s" name="post" id="comment-submit" value="<__trans phrase="Submit">" />
+                </div>
+            </form>
+
+
+        </div>
+    </div>
+    </MTIfCommentsAccepted>
+
+
 </div>
 </MTIfCommentsActive>
Index: branches/release-33/default_templates/search_results.mtml
===================================================================
--- branches/release-33/default_templates/search_results.mtml (revision 1641)
+++ branches/release-33/default_templates/search_results.mtml (revision 1709)
@@ -1,151 +1,162 @@
-<MTSetVar name="body_class" value="mt-search-results">
-<MTSetVar name="system_template" value="1">
 <MTSetVar name="search_results_template" value="1">
-<MTSetVarBlock name="page_title"><__trans phrase="Search Results"></MTSetVarBlock>
-<MTSetVarBlock name="title"><$MTBlogName encode_html="1"$>: <$MTGetVar name="page_title"$></MTSetVarBlock>
-<MTIfStraightSearch>
-    <MTSetVar name="search_type" value="search">
-<MTElse>
-    <MTSetVar name="search_type" value="tag">
-</MTIfStraightSearch>
+<!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><$MTBlogName encode_html="1"$>: <__trans phrase="Search Results"></title>
+    <$mt:include module="<__trans phrase="HTML Head">"$>
+    <MTIgnore>Below Javascript adds ajax search capability</MTIgnore>
+    <script type="text/javascript">
+    <!--
+    <MTIfMoreResults>
+    function getXmlHttp() {
+        if ( !window.XMLHttpRequest ) {
+            window.XMLHttpRequest = function() {
+                var types = [
+                    "Microsoft.XMLHTTP",
+                    "MSXML2.XMLHTTP.5.0",
+                    "MSXML2.XMLHTTP.4.0",
+                    "MSXML2.XMLHTTP.3.0",
+                    "MSXML2.XMLHTTP"
+                ];
 
-<MTSetVarTemplate id="search_results" name="search_results">
-<div id="search-results"><span id="current-page" class="hidden"><MTCurrentPage></span>
+                for ( var i = 0; i < types.length; i++ ) {
+                    try {
+                        return new ActiveXObject( types[ i ] );
+                    } catch( e ) {}
+                }
+
+                return undefined;
+            };
+        }
+        if ( window.XMLHttpRequest )
+            return new XMLHttpRequest();
+    }
+
+    function getResults(page) {
+        page = parseInt(page);
+        if (timer) window.clearTimeout(timer);
+        var xh = getXmlHttp();
+        if (!xh) return false;
+        var res = results[page];
+        if (!res) return;
+        var url = res['next_url'];
+        if (!url) return;
+
+        xh.open('GET', url + '&format=js', true);
+        xh.onreadystatechange = function() {
+            if ( xh.readyState == 4 ) {
+                if ( xh.status && ( xh.status != 200 ) ) {
+                    // error - ignore
+                } else {
+                    try {
+                        var page_results = eval("(" + xh.responseText + ")");
+                        if ( page_results['error'] == null )
+                            results[page + 1] = page_results['result'];
+                    } catch (e) {
+                    }
+                }
+            }
+        };
+        xh.send(null);
+    }
+
+    function swapContent(direction) {
+        if ( direction == undefined ) direction = 1;
+        var page_span = document.getElementById('current-page');
+        if (!page_span) return true;
+        var next_page = direction + parseInt(page_span.innerHTML);
+        var res = results[next_page];
+        if (!res) return true;
+        var content = res['content'];
+        if (!content) return true;
+        var div = document.getElementById('search-results');
+        if (!div) return true;
+        div.innerHTML = content;
+        timer = window.setTimeout("getResults(" + next_page + ")", 1*1000);
+        window.scroll(0, 0);
+        return false;
+    }
+    <MTElse><MTIfPreviousResults>
+    function swapContent(direction) {
+    	return true;
+    }</MTIfPreviousResults>
+    </MTIfMoreResults>
+    //-->
+    </script>
+</head>
+<body class="mt-search-results <$MTVar name="page_layout"$>">
+    <div id="container">
+        <div id="container-inner">
+
+
+            <$mt:include module="<__trans phrase="Banner Header">"$>
+
+
+            <div id="content">
+                <div id="content-inner">
+
+
+                    <div id="alpha">
+                        <div id="alpha-inner">
+
+
+<mt:ignore><!-- Display search results --></mt:ignore>
 <MTSearchResults>
     <MTBlogResultHeader>
-<h1 id="page-title" class="search-results-header">
+                            <div id="search-results">
+                                <span id="current-page" class="hidden"><MTCurrentPage></span>
+                                <h1 id="page-title" class="search-results-header">
         <MTIfStraightSearch>
-    <__trans phrase="Results matching &ldquo;[_1]&rdquo; from [_2]" params="<$MTSearchString$>%%<$MTBlogName encode_html="1"$>">
+                                    <__trans phrase="Results matching &ldquo;[_1]&rdquo; from [_2]" params="<$MTSearchString$>%%<$MTBlogName encode_html="1"$>">
         </MTIfStraightSearch>
         <MTIfTagSearch>
-    <__trans phrase="Results tagged &ldquo;[_1]&rdquo; from [_2]" params="<$MTSearchString$>%%<$MTBlogName encode_html="1"$>">
+                                    <__trans phrase="Results tagged &ldquo;[_1]&rdquo; from [_2]" params="<$MTSearchString$>%%<$MTBlogName encode_html="1"$>">
         </MTIfTagSearch>
-</h1>
-<div class="search-results-container autopagerize_page_element">
+                                </h1>
+                                <div class="search-results-container autopagerize_page_element">
     </MTBlogResultHeader>
-    <$MTInclude module="<__trans phrase="Entry Summary">" hide_counts="1"$>
+                                    <$MTInclude module="<__trans phrase="Entry Summary">" hide_counts="1"$>
     <MTBlogResultFooter>
-</div><div class="autopagerize_insert_before"></div>
+                                </div><div class="autopagerize_insert_before"></div>
+
+    <MTIgnore><!-- Used with the ajax search capability of the new search class --></MTIgnore>
+                                <div class="content-nav">
+                                    <MTIfPreviousResults><a href="<MTPreviousLink>" rel="prev" onclick="return swapContent(-1);">&lt; <__trans phrase="Previous"></a>&nbsp;&nbsp;</MTIfPreviousResults><MTPagerBlock><MTIfCurrentPage><MTVar name="__value__"><MTElse><a href="<MTPagerLink>"><MTVar name="__value__"></a></MTIfCurrentPage><mt:unless name="__last__">&nbsp;</mt:unless></MTPagerBlock><MTIfMoreResults>&nbsp;&nbsp;<a href="<MTNextLink>" rel="next" onclick="return swapContent();"><__trans phrase="Next"> &gt;</a></MTIfMoreResults>
+                                </div>
+                            </div>
     </MTBlogResultFooter>
 </MTSearchResults>
-<MTIgnore>Used with the ajax search capability of the new search class</MTIgnore>
-    <div class="content-nav">
-<MTIfPreviousResults><a href="<MTPreviousLink>" rel="prev" onclick="return swapContent(-1);">&lt; <__trans phrase="Previous"></a>&nbsp;&nbsp;</MTIfPreviousResults><MTPagerBlock><MTIfCurrentPage><mt:var name="__value__"><MTElse><a href="<MTPagerLink>"><mt:var name="__value__"></a></MTIfCurrentPage><mt:unless name="__last__">&nbsp;</mt:unless></MTPagerBlock><MTIfMoreResults>&nbsp;&nbsp;<a href="<MTNextLink>" rel="next" onclick="return swapContent();"><__trans phrase="Next"> &gt;</a></MTIfMoreResults>
-    </div>
-</div>
-</MTSetVarTemplate>
 
-<MTIgnore>Used with the ajax search capability of the new search class</MTIgnore>
-<MTSetVarBlock name="html_head" append="1">
-<script type="text/javascript">
-<!--
-<MTIfMoreResults>
-function getXmlHttp() {
-    if ( !window.XMLHttpRequest ) {
-        window.XMLHttpRequest = function() {
-            var types = [
-                "Microsoft.XMLHTTP",
-                "MSXML2.XMLHTTP.5.0",
-                "MSXML2.XMLHTTP.4.0",
-                "MSXML2.XMLHTTP.3.0",
-                "MSXML2.XMLHTTP"
-            ];
 
-            for ( var i = 0; i < types.length; i++ ) {
-                try {
-                    return new ActiveXObject( types[ i ] );
-                } catch( e ) {}
-            }
-
-            return undefined;
-        };
-    }
-    if ( window.XMLHttpRequest )
-        return new XMLHttpRequest();
-}
-
-function getResults(page) {
-    page = parseInt(page);
-    if (timer) window.clearTimeout(timer);
-    var xh = getXmlHttp();
-    if (!xh) return false;
-    var res = results[page];
-    if (!res) return;
-    var url = res['next_url'];
-    if (!url) return;
-
-    xh.open('GET', url + '&format=js', true);
-    xh.onreadystatechange = function() {
-        if ( xh.readyState == 4 ) {
-            if ( xh.status && ( xh.status != 200 ) ) {
-                // error - ignore
-            } else {
-                try {
-                    var page_results = eval("(" + xh.responseText + ")");
-                    if ( page_results['error'] == null )
-                        results[page + 1] = page_results['result'];
-                } catch (e) {
-                }
-            }
-        }
-    };
-    xh.send(null);
-}
-
-function swapContent(direction) {
-    if ( direction == undefined ) direction = 1;
-    var page_span = document.getElementById('current-page');
-    if (!page_span) return true;
-    var next_page = direction + parseInt(page_span.innerHTML);
-    var res = results[next_page];
-    if (!res) return true;
-    var content = res['content'];
-    if (!content) return true;
-    var div = document.getElementById('search-results');
-    if (!div) return true;
-    div.innerHTML = content;
-    timer = window.setTimeout("getResults(" + next_page + ")", 1*1000);
-    window.scroll(0, 0);
-    return false;
-}
-<MTElse><MTIfPreviousResults>
-function swapContent(direction) {
-	return true;
-}</MTIfPreviousResults>
-</MTIfMoreResults>
-//-->
-</script>
-</MTSetVarBlock>
-
-<$MTInclude module="<__trans phrase="Header">"$>
-
-<$MTVar name="search_results"$>
-
+<mt:ignore><!-- Display no results message --></mt:ignore>
 <MTNoSearchResults>
-<h1 id="page-title" class="search-results-header">
+                            <h1 id="page-title" class="search-results-header">
     <MTIfStraightSearch>
-    <__trans phrase="Results matching &ldquo;[_1]&rdquo;" params="<$MTSearchString$>">
+                                <__trans phrase="Results matching &ldquo;[_1]&rdquo;" params="<$MTSearchString$>">
     </MTIfStraightSearch>
     <MTIfTagSearch>
-    <__trans phrase="Results tagged &ldquo;[_1]&rdquo;" params="<$MTSearchString$>">
+                                <__trans phrase="Results tagged &ldquo;[_1]&rdquo;" params="<$MTSearchString$>">
     </MTIfTagSearch>
-</h1>
-<p><__trans phrase="No results found for &ldquo;[_1]&rdquo;." params="<$MTSearchString$>"></p>
+                            </h1>
+                            <p><__trans phrase="No results found for &ldquo;[_1]&rdquo;." params="<$MTSearchString$>"></p>
 </MTNoSearchResults>
 
+
+<mt:ignore><!-- Display instructions for searching if search script was accessed without a query --></mt:ignore>
 <MTNoSearch>
-<h1 id="page-title" class="search-results-header"><__trans phrase="Instructions"></h1>
-<p><__trans phrase="By default, this search engine looks for all words in any order. To search for an exact phrase, enclose the phrase in quotes:"></p>
-<blockquote>
-    <p><code>"<__trans phrase="movable type">"</code></p>
-</blockquote>
-<p><__trans phrase="The search engine also supports AND, OR, and NOT keywords to specify boolean expressions:"></p>
-<blockquote>
-    <p><code><__trans phrase="personal OR publishing"></code></p>
-    <p><code><__trans phrase="publishing NOT personal"></code></p>
-</blockquote>
+                            <h1 id="page-title" class="search-results-header"><__trans phrase="Instructions"></h1>
+                            <p><__trans phrase="By default, this search engine looks for all words in any order. To search for an exact phrase, enclose the phrase in quotes:"></p>
+                            <blockquote>
+                                <p><code>"<__trans phrase="movable type">"</code></p>
+                            </blockquote>
+                            <p><__trans phrase="The search engine also supports AND, OR, and NOT keywords to specify boolean expressions:"></p>
+                            <blockquote>
+                                <p><code><__trans phrase="personal OR publishing"></code></p>
+                                <p><code><__trans phrase="publishing NOT personal"></code></p>
+                            </blockquote>
 </MTNoSearch>
 
-<MTIgnore>Used with the ajax search capability of the new search class</MTIgnore>
+<MTIgnore><!-- Used with the ajax search capability of the new search class --></MTIgnore>
 <MTIfMoreResults>
 <script type="text/javascript">
@@ -162,3 +173,21 @@
 </script>
 </MTIfMoreResults>
-<$MTInclude module="<__trans phrase="Footer">"$>
+
+
+                        </div>
+                    </div>
+
+                    <$MTInclude module="<__trans phrase="Sidebar">"$>
+
+
+                </div>
+            </div>
+
+
+            <$mt:include module="<__trans phrase="Banner Footer">"$>
+
+
+        </div>
+    </div>
+</body>
+</html>
Index: branches/release-33/default_templates/category_entry_listing.mtml
===================================================================
--- branches/release-33/default_templates/category_entry_listing.mtml (revision 1709)
+++ branches/release-33/default_templates/category_entry_listing.mtml (revision 1709)
@@ -0,0 +1,71 @@
+<!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><$MTBlogName encode_html="1"$>: <__trans phrase="[_1] Archives" params="<$MTArchiveTitle$>"></title>
+    <$mt:include module="<__trans phrase="HTML Head">"$>
+<mt:ignore>
+    <!-- Include Next and Previous links if publishing a date-based archive -->
+</mt:ignore>
+<MTIf name="datebased_archive">
+    <MTArchivePrevious><link rel="prev" href="<$MTArchiveLink$>" title="<$MTArchiveTitle encode_html="1"$>" /></MTArchivePrevious>
+    <MTArchiveNext><link rel="next" href="<$MTArchiveLink$>" title="<$MTArchiveTitle encode_html="1"$>" /></MTArchiveNext>
+</MTIf>
+</head>
+<body class="mt-archive-listing mt-<MTVar name="archive_class"> <$MTVar name="page_layout"$>">
+    <div id="container">
+        <div id="container-inner">
+
+
+            <$mt:include module="<__trans phrase="Banner Header">"$>
+
+
+            <div id="content">
+                <div id="content-inner">
+
+
+                    <div id="alpha">
+                        <div id="alpha-inner">
+<MTIf name="datebased_archive">
+                            <mt:ignore><!-- Title for category-monthly entry listings --></mt:ignore>
+                            <h1 id="page-title" class="archive-title"><__trans phrase="[_1] Archives" params="<$MTArchiveTitle$>"></h1>
+<MTElse>
+                            <mt:ignore><!-- Title for category entry listings --></mt:ignore>
+                            <h1 id="page-title" class="archive-title"><__trans phrase="Recently in <em>[_1]</em> Category" params="<$MTArchiveTitle$>"></h1>
+</MTIf>
+
+
+<mt:ignore><!-- Limit number of entries to the number set in Blog Entry Settings --></mt:ignore>
+<MTUnless name="datebased_archive"><$mt:setvar name="limit" value="auto"$></MTUnless>
+<MTEntries limit="$limit">
+                            <mt:ignore><!-- Use the Entry Summary module for each entry published on this page --></mt:ignore>
+                            <$mt:include module="Entry Summary"$>
+</MTEntries>
+
+
+                            <div class="content-nav">
+                                <MTArchivePrevious><a href="<$MTArchiveLink$>">&laquo; <$MTArchiveTitle$></a> |</MTArchivePrevious>
+                                <a href="<$MTLink template="main_index"$>"><__trans phrase="Main Index"></a> |
+                                <a href="<$MTLink template="archive_index"$>"><__trans phrase="Archives"></a>
+                                <MTArchiveNext>| <a href="<$MTArchiveLink$>"><$MTArchiveTitle$> &raquo;</a></MTArchiveNext>
+                            </div>
+
+
+                        </div>
+                    </div>
+
+
+                    <$MTInclude module="<__trans phrase="Sidebar">"$>
+
+
+                </div>
+            </div>
+
+
+            <$mt:include module="<__trans phrase="Banner Footer">"$>
+
+
+        </div>
+    </div>
+</body>
+</html>
Index: branches/release-33/default_templates/dynamic_error.mtml
===================================================================
--- branches/release-33/default_templates/dynamic_error.mtml (revision 1463)
+++ branches/release-33/default_templates/dynamic_error.mtml (revision 1709)
@@ -1,12 +1,43 @@
-<MTSetVar name="dynamic_error_template" value="1">
-<MTSetVarBlock name="page_title"><__trans phrase="Page Not Found"></MTSetVarBlock>
-<MTSetVarBlock name="title"><$MTBlogName encode_html="1"$>: <$MTVar name="page_title"$></MTSetVarBlock>
+<!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><$MTBlogName encode_html="1"$>: <__trans phrase="Page Not Found"></title>
+    <$mt:include module="<__trans phrase="HTML Head">"$>
+</head>
+<body class="mt-dynamic-error <$MTVar name="page_layout"$>">
+    <div id="container">
+        <div id="container-inner">
 
-<$MTInclude module="<__trans phrase="Header">" body_class="mt-dynamic-error"$>
 
-<h1 id="page-title"><$MTVar name="page_title"$></h1>
-<blockquote>
-    <strong><$MTErrorMessage$></strong>
-</blockquote>
+            <$mt:include module="<__trans phrase="Banner Header">"$>
 
-<$MTInclude module="<__trans phrase="Footer">"$>
+
+            <div id="content">
+                <div id="content-inner">
+
+
+                    <div id="alpha">
+                        <div id="alpha-inner">
+                            <h1 id="page-title"><__trans phrase="Page Not Found"></h1>
+                            <blockquote>
+                                <strong><$MTErrorMessage$></strong>
+                            </blockquote>
+                        </div>
+                    </div>
+
+
+                    <$MTInclude module="<__trans phrase="Sidebar">"$>
+
+
+                </div>
+            </div>
+
+
+            <$mt:include module="<__trans phrase="Banner Footer">"$>
+
+
+        </div>
+    </div>
+</body>
+</html>
Index: branches/release-33/default_templates/entry.mtml
===================================================================
--- branches/release-33/default_templates/entry.mtml (revision 1463)
+++ branches/release-33/default_templates/entry.mtml (revision 1709)
@@ -1,21 +1,102 @@
-<MTSetVar name="body_class" value="mt-archive-listing mt-entry-archive">
-<MTSetVar name="module_about_context" value="1">
-<MTIfCommentsAccepted><$MTSetVar name="body_onload" value="individualArchivesOnLoad(commenter_name)"$></MTIfCommentsAccepted>
-<MTSetVarBlock name="page_title"><$MTEntryTitle$></MTSetVarBlock>
-<MTSetVarBlock name="title"><$MTGetVar name="page_title"$> - <$MTBlogName encode_html="1"$></MTSetVarBlock>
-<MTSetVarBlock name="html_head">
+<!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><$MTEntryTitle encode_html="1"$> - <$MTBlogName encode_html="1"$></title>
+    <$mt:include module="<__trans phrase="HTML Head">"$>
     <MTEntryPrevious><link rel="prev" href="<$MTEntryPermalink$>" title="<$MTEntryTitle encode_html="1"$>" /></MTEntryPrevious>
     <MTEntryNext><link rel="next" href="<$MTEntryPermalink$>" title="<$MTEntryTitle encode_html="1"$>" /></MTEntryNext>
-    <MTIfPingsAccepted><$MTEntryTrackbackData$></MTIfPingsAccepted>
+    <$MTEntryTrackbackData$>
     <MTIfCommentsAccepted><script type="text/javascript" src="<$MTLink template="javascript"$>"></script></MTIfCommentsAccepted>
-</MTSetVarBlock>
+</head>
+<body class="mt-entry-archive <$MTVar name="page_layout"$>" onload="individualArchivesOnLoad(commenter_name)">
+    <div id="container">
+        <div id="container-inner">
 
-<$MTInclude module="<__trans phrase="Header">"$>
 
-<$MTInclude module="<__trans phrase="Entry Detail">"$>
+            <$mt:include module="<__trans phrase="Banner Header">"$>
 
-<$MTInclude module="<__trans phrase="TrackBacks">"$>
 
-<$MTInclude module="<__trans phrase="Comments">"$>
+            <div id="content">
+                <div id="content-inner">
 
-<$MTInclude module="<__trans phrase="Footer">"$>
+
+                    <div id="alpha">
+                        <div id="alpha-inner">
+
+
+                            <div id="entry-<$MTEntryID$>" class="entry-asset asset hentry">
+                                <div class="asset-header">
+                                    <h1 id="page-title" class="asset-name entry-title"><$MTEntryTitle$></h1>
+                                    <div class="asset-meta">
+                                        <span class="byline">
+<MTIfNonEmpty tag="EntryAuthorDisplayName">
+                                            <__trans phrase="By [_1] on [_2]" params="<span class="vcard author"><$MTEntryAuthorLink show_hcard="1"$></span>%%<abbr class="published" title="<$MTEntryDate format_name="iso8601"$>"><$MTEntryDate format="%x %X"$></abbr>">
+<MTElse>
+                                            <abbr class="published" title="<$MTEntryDate format_name="iso8601"$>"><$MTEntryDate format="%x %X"$></abbr>
+</MTIfNonEmpty>
+                                        </span>
+                                        <span class="separator">|</span> <a class="permalink" rel="bookmark" href="<$MTEntryPermalink$>"><__trans phrase="Permalink"></a>
+<MTIfCommentsActive>
+                                        <span class="separator">|</span> <a href="<$MTEntryPermalink$>#comments"><__trans phrase="Comments ([_1])" params="<$MTEntryCommentCount$>"></a>
+</MTIfCommentsActive>
+<MTIfPingsActive>
+                                        <span class="separator">|</span> <a href="<$MTEntryPermalink$>#trackback"><__trans phrase="TrackBacks ([_1])" params="<$MTEntryTrackbackCount$>"></a>
+</MTIfPingsActive>
+                                    </div>
+                                </div>
+                                <div class="asset-content entry-content">
+<MTIfNonEmpty tag="EntryBody">
+                                    <div class="asset-body">
+                                        <$MTEntryBody$>
+                                    </div>
+</MTIfNonEmpty>
+<MTIfNonEmpty tag="EntryMore" convert_breaks="0">
+                                    <div id="more" class="asset-more">
+                                        <$MTEntryMore$>
+                                    </div>
+</MTIfNonEmpty>
+                                </div>
+                                <div class="asset-footer">
+<MTIfNonEmpty tag="EntryCategory">
+                                    <div class="entry-categories">
+                                        <h4 class="entry-categories-header"><__trans phrase="Categories"><span class="delimiter">:</span></h4>
+                                        <ul class="entry-categories-list">
+                                            <li class="entry-category"><MTEntryCategories glue='<span class="delimiter">,</span></li> <li class="entry-category">'><a href="<$MTCategoryArchiveLink$>" rel="tag"><$MTCategoryLabel$></a></MTEntryCategories></li>
+                                        </ul>
+                                    </div>
+</MTIfNonEmpty>
+<MTEntryIfTagged>
+                                    <div class="entry-tags">
+                                        <h4 class="entry-tags-header"><__trans phrase="Tags"><span class="delimiter">:</span></h4>
+                                        <ul class="entry-tags-list">
+                                            <li class="entry-tag"><MTEntryTags glue='<span class="delimiter">,</span></li> <li class="entry-tag">'><a href="<$MTTagSearchLink$>" rel="tag"><$MTTagName$></a></MTEntryTags></li>
+                                        </ul>
+                                    </div>
+</MTEntryIfTagged>
+                                </div>
+                            </div>
+
+
+                    <$MTInclude module="<__trans phrase="Trackbacks">"$>
+                    <$MTInclude module="<__trans phrase="Comments">"$>
+
+
+                        </div>
+                    </div>
+
+
+                    <$MTInclude module="<__trans phrase="Sidebar">"$>
+
+
+                </div>
+            </div>
+
+
+            <$mt:include module="<__trans phrase="Banner Footer">"$>
+
+
+        </div>
+    </div>
+</body>
+</html>
Index: branches/release-33/default_templates/comment_preview.mtml
===================================================================
--- branches/release-33/default_templates/comment_preview.mtml (revision 1463)
+++ branches/release-33/default_templates/comment_preview.mtml (revision 1709)
@@ -1,17 +1,122 @@
-<MTSetVar name="body_onload" value="individualArchivesOnLoad(commenter_name)">
-<MTSetVar name="feedback_template" value="1">
-<MTSetVarBlock name="page_title"><__trans phrase="Previewing your Comment"></MTSetVarBlock>
-<MTSetVarBlock name="title"><$MTBlogName encode_html="1"$>: <$MTVar name="page_title"$></MTSetVarBlock>
-<MTSetVarBlock name="html_head">
-<script type="text/javascript" src="<$MTLink template="javascript"$>"></script>
-</MTSetVarBlock>
+<!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><$MTBlogName encode_html="1"$>: <__trans phrase="Previewing your Comment"></title>
+    <$mt:include module="<__trans phrase="HTML Head">"$>
+    <script type="text/javascript" src="<$MTLink template="javascript"$>"></script>
+</head>
+<body class="mt-comment-preview <$MTVar name="page_layout"$>" onload="individualArchivesOnLoad(commenter_name)">
+    <div id="container">
+        <div id="container-inner">
 
-<$MTInclude module="<__trans phrase="Header">" body_class="mt-comment-preview"$>
 
-<h1 id="page-title"><$MTVar name="page_title"$></h1>
+            <$mt:include module="<__trans phrase="Banner Header">"$>
 
-<$MTInclude module="<__trans phrase="Comment Detail">"$>
 
-<$MTInclude module="<__trans phrase="Comments">"$>
+            <div id="content">
+                <div id="content-inner">
 
-<$MTInclude module="<__trans phrase="Footer">"$>
+
+                    <div id="alpha">
+                        <div id="alpha-inner">
+
+
+                            <h1 id="page-title"><$MTVar name="page_title"$></h1>
+
+
+<mt:ignore><!-- Comment Preview --></mt:ignore>
+                            <div class="comment"<MTIfArchiveTypeEnabled archive_type="Individual"> id="comment-<$MTCommentID$>"</MTIfArchiveTypeEnabled>>
+                                <div class="inner">
+                                    <div class="comment-header">
+                                        <div class="asset-meta">
+                                            <span class="byline">
+                                                <__trans phrase="By"> <span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span><MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty>
+                                                <MTCommentParent>
+                                                <__trans phrase="replied to"> <a href="#comment-<$MTCommentID$>"><$MTCommentAuthor$></a>
+                                                </MTCommentParent>
+                                                <__trans phrase="on"> <a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>
+                                                <MTIfCommentsAccepted> | <$MTCommentReplyLink$></MTIfCommentsAccepted>
+                                            </span>
+                                        </div>
+                                    </div>
+                                    <div class="comment-content">
+                                        <$MTCommentBody$>
+                                    </div>
+                                </div>
+                            </div>
+
+
+<mt:ignore><!-- Comment Form --></mt:ignore>
+<MTIfCommentsAccepted>
+                            <div class="comments-open" id="comments-open">
+                                <h2 class="comments-open-header"><__trans phrase="Leave a comment"></h2>
+                                <div class="comments-open-content">
+    <MTIfRegistrationAllowed>
+                                        <div id="comment-form-external-auth">
+                                            <script type="text/javascript">
+                                            /* <![CDATA[ */
+                                            is_preview = true;
+                                            writeCommenterGreeting(commenter_name, <$MTEntryID$>, <$MTEntryBlogID$>, commenter_id, commenter_url);
+                                            /* ]]> */
+                                            </script>
+                                        </div>
+    </MTIfRegistrationAllowed>
+                                    <form method="post" action="<$MTCGIPath$><$MTCommentScript$>" name="comments_form" id="comments-form" onsubmit="if (this.bakecookie.checked) rememberMe(this)">
+                                        <input type="hidden" name="static" value="1" />
+                                        <input type="hidden" name="entry_id" value="<$MTEntryID$>" />
+                                        <input type="hidden" name="__lang" value="<$MTBlogLanguage$>" />
+                                        <div id="comments-open-data">
+                                            <div id="comment-form-name">
+                                                <label for="comment-author"><__trans phrase="Name"></label>
+                                                <input id="comment-author" name="author" size="30" value="<$MTCommentAuthor encode_html="1"$>" />
+                                            </div>
+                                            <div id="comment-form-email">
+                                                <label for="comment-email"><__trans phrase="Email Address"></label>
+                                                <input id="comment-email" name="email" size="30" value="<$MTCommentEmail encode_html="1"$>" />
+                                            </div>
+                                            <div id="comment-form-url">
+                                                <label for="comment-url"><__trans phrase="URL"></label>
+                                                <input id="comment-url" name="url" size="30" value="<$MTCommentURL encode_html="1"$>" />
+                                            </div>
+                                            <div id="comment-form-remember-me">
+                                                <label for="comment-bake-cookie"><input type="checkbox" id="comment-bake-cookie" name="bakecookie" onclick="if (!this.checked) forgetMe(document.comments_form)" value="1" />
+                                                    <__trans phrase="Remember personal info?"></label>
+                                            </div>
+                                        </div>
+                                        <div id="comments-open-text">
+                                            <label for="comment-text"><__trans phrase="Comments"> <MTIfAllowCommentHTML><__trans phrase="(You may use HTML tags for style)"></MTIfAllowCommentHTML></label>
+                                            <textarea id="comment-text" name="text" rows="15" cols="50"><$MTCommentBody autolink="0" sanitize="0" convert_breaks="0" encode_html="1"$></textarea>
+                                        </div>
+    <MTIfNonEmpty tag="MTCaptchaFields">
+                                        <MTIfCommentsAccepted><MTIfRegistrationAllowed><MTElse><$MTCaptchaFields$></MTIfRegistrationAllowed></MTIfCommentsAccepted>
+                                        <div id="comments-open-captcha">
+                                        </div>
+    </MTIfNonEmpty>
+                                        <div id="comments-open-footer">
+                                            <input type="submit" accesskey="v" name="preview" id="comment-preview" value="<__trans phrase="Preview">" />
+                                            <input type="submit" accesskey="s" name="post" id="comment-submit" value="<__trans phrase="Submit">" />
+                                            <input type="button" name="cancel" id="comment-cancel" value="<__trans phrase="Cancel">" onclick="window.location='<$MTEntryPermalink$>'" />
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
+</MTIfCommentsAccepted>
+                        </div>
+                    </div>
+
+
+                    <$MTInclude module="<__trans phrase="Sidebar">"$>
+
+
+                </div>
+            </div>
+
+
+            <$mt:include module="<__trans phrase="Banner Footer">"$>
+
+
+        </div>
+    </div>
+</body>
+</html>
Index: branches/release-33/default_templates/monthly_entry_listing.mtml
===================================================================
--- branches/release-33/default_templates/monthly_entry_listing.mtml (revision 1709)
+++ branches/release-33/default_templates/monthly_entry_listing.mtml (revision 1709)
@@ -0,0 +1,67 @@
+<!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><$MTBlogName encode_html="1"$>: <__trans phrase="[_1] Archives" params="<$MTArchiveTitle$>"></title>
+    <$mt:include module="<__trans phrase="HTML Head">"$>
+<mt:ignore>
+    <!-- Include Next and Previous links if publishing a date-based archive -->
+</mt:ignore>
+<MTIf name="datebased_archive">
+    <MTArchivePrevious><link rel="prev" href="<$MTArchiveLink$>" title="<$MTArchiveTitle encode_html="1"$>" /></MTArchivePrevious>
+    <MTArchiveNext><link rel="next" href="<$MTArchiveLink$>" title="<$MTArchiveTitle encode_html="1"$>" /></MTArchiveNext>
+</MTIf>
+</head>
+<body class="mt-archive-listing mt-<MTVar name="archive_class"> <$MTVar name="page_layout"$>">
+    <div id="container">
+        <div id="container-inner">
+
+
+            <$mt:include module="<__trans phrase="Banner Header">"$>
+
+
+            <div id="content">
+                <div id="content-inner">
+
+
+                    <div id="alpha">
+                        <div id="alpha-inner">
+
+
+                            <h1 id="page-title" class="archive-title"><__trans phrase="[_1] Archives" params="<$MTArchiveTitle$>"></h1>
+
+
+<mt:ignore><!-- Limit number of entries to the number set in Blog Entry Settings --></mt:ignore>
+<MTUnless name="datebased_archive"><$mt:setvar name="limit" value="auto"$></MTUnless>
+<MTEntries limit="$limit">
+                            <mt:ignore><!-- Use the Entry Summary module for each entry published on this page --></mt:ignore>
+                            <$mt:include module="Entry Summary"$>
+</MTEntries>
+
+
+                            <div class="content-nav">
+                                <MTArchivePrevious><a href="<$MTArchiveLink$>">&laquo; <$MTArchiveTitle$></a> |</MTArchivePrevious>
+                                <a href="<$MTLink template="main_index"$>"><__trans phrase="Main Index"></a> |
+                                <a href="<$MTLink template="archive_index"$>"><__trans phrase="Archives"></a>
+                                <MTArchiveNext>| <a href="<$MTArchiveLink$>"><$MTArchiveTitle$> &raquo;</a></MTArchiveNext>
+                            </div>
+
+
+                        </div>
+                    </div>
+
+
+                    <$MTInclude module="<__trans phrase="Sidebar">"$>
+
+
+                </div>
+            </div>
+
+
+            <$mt:include module="<__trans phrase="Banner Footer">"$>
+
+
+        </div>
+    </div>
+</body>
+</html>
Index: branches/release-33/default_templates/javascript.mtml
===================================================================
--- branches/release-33/default_templates/javascript.mtml (revision 1673)
+++ branches/release-33/default_templates/javascript.mtml (revision 1709)
@@ -126,7 +126,7 @@
     } else {
 <MTIfRegistrationRequired>
-        var phrase = '<__trans phrase="[_1]Sign in[_2] to comment on this entry." params="<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=login&entry_id=' + entry_id + '&blog_id=' + blog_id + '&static=1">%%</a>">';
+        var phrase = '<__trans phrase="[_1]Sign in[_2] to comment on this entry." params="<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=login&entry_id=' + entry_id + '&blog_id=' + blog_id + '&static=1&return_to=' + encodeURIComponent(document.URL) + '">%%</a>">';
 <MTElse>
-        var phrase = '<__trans phrase="[_1]Sign in[_2] to comment on this entry, or [_3]comment anonymously[_2]." params="<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=login&entry_id=' + entry_id + '&blog_id=' + blog_id + '&static=1">%%</a>%%<a href="javascript:void(0);" onclick="showAnonymousForm();">">';
+        var phrase = '<__trans phrase="[_1]Sign in[_2] to comment on this entry, or [_3]comment anonymously[_2]." params="<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=login&entry_id=' + entry_id + '&blog_id=' + blog_id + '&static=1&return_to=' + encodeURIComponent(document.URL) + '">%%</a>%%<a href="javascript:void(0);" onclick="showAnonymousForm();">">';
 </MTIfRegistrationRequired>
         document.write(phrase);
Index: branches/release-33/default_templates/entry_detail.mtml
===================================================================
--- branches/release-33/default_templates/entry_detail.mtml (revision 1423)
+++  (revision )
@@ -1,22 +1,0 @@
-<div id="entry-<$MTEntryID$>" class="entry-asset asset hentry">
-    <div class="asset-header">
-        <h1 id="page-title" class="asset-name entry-title"><$MTEntryTitle$></h1>
-        <$MTInclude module="<__trans phrase="Entry Metadata">"$>
-    </div>
-    <div class="asset-content entry-content">
-<MTIfNonEmpty tag="EntryBody">
-        <div class="asset-body">
-            <$MTEntryBody$>
-        </div>
-</MTIfNonEmpty>
-<MTIfNonEmpty tag="EntryMore" convert_breaks="0">
-        <div id="more" class="asset-more">
-            <$MTEntryMore$>
-        </div>
-</MTIfNonEmpty>
-    </div>
-    <div class="asset-footer">
-        <$MTInclude module="<__trans phrase="Categories">"$>
-        <$MTInclude module="<__trans phrase="Tags">"$>
-    </div>
-</div>
Index: branches/release-33/default_templates/comment_detail.mtml
===================================================================
--- branches/release-33/default_templates/comment_detail.mtml (revision 1561)
+++  (revision )
@@ -1,20 +1,0 @@
-<div class="comment"<MTIfArchiveTypeEnabled archive_type="Individual"> id="comment-<$MTCommentID$>"</MTIfArchiveTypeEnabled>>
-    <div class="inner">
-        <div class="comment-header">
-            <div class="asset-meta">
-               <span class="byline">
-                   <__trans phrase="By"> <span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span><MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty>
-                   <MTCommentParent>
-                   <__trans phrase="replied to"> <a href="#comment-<$MTCommentID$>"><MTCommentAuthor></a>
-                   </MTCommentParent>
-                   <__trans phrase="on"> <a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>
-                   <MTIfCommentsAccepted> | <$MTCommentReplyLink$></MTIfCommentsAccepted>
-               </span>
-            </div>
-        </div>
-        <div class="comment-content">
-            <$MTCommentBody$>
-        </div>
-    </div>
-</div>
-
Index: branches/release-33/default_templates/comment_form.mtml
===================================================================
--- branches/release-33/default_templates/comment_form.mtml (revision 1561)
+++  (revision )
@@ -1,61 +1,0 @@
-<MTIfCommentsAccepted>
-<div class="comments-open" id="comments-open">
-    <h2 class="comments-open-header"><__trans phrase="Leave a comment"></h2>
-    <div class="comments-open-content">
-    <MTIfRegistrationAllowed>
-            <div id="comment-form-external-auth">
-                <script type="text/javascript">
-                /* <![CDATA[ */
-                <MTIf name="comment_preview_template">is_preview = true;</MTIf>
-                writeCommenterGreeting(commenter_name, <$MTEntryID$>, <$MTEntryBlogID$>, commenter_id, commenter_url);
-                /* ]]> */
-                </script>
-            </div>
-    </MTIfRegistrationAllowed>
-        <form method="post" action="<$MTCGIPath$><$MTCommentScript$>" name="comments_form" id="comments-form" onsubmit="if (this.bakecookie.checked) rememberMe(this)">
-            <input type="hidden" name="static" value="1" />
-            <input type="hidden" name="entry_id" value="<$MTEntryID$>" />
-            <input type="hidden" name="__lang" value="<$MTBlogLanguage$>" />
-            <input type="hidden" name="parent_id" value="<MTIf name="comment_preview_template"><$MTCommentParentID$></MTIf>" id="comment-parent-id" />
-            <div id="comments-open-data">
-                <div id="comment-form-name">
-                    <label for="comment-author"><__trans phrase="Name"></label>
-                    <input id="comment-author" name="author" size="30" value="<MTIf name="comment_preview_template"><$MTCommentAuthor encode_html="1"$></MTIf>" />
-                </div>
-                <div id="comment-form-email">
-                    <label for="comment-email"><__trans phrase="Email Address"></label>
-                    <input id="comment-email" name="email" size="30" value="<MTIf name="comment_preview_template"><$MTCommentEmail encode_html="1"$></MTIf>" />
-                </div>
-                <div id="comment-form-url">
-                    <label for="comment-url"><__trans phrase="URL"></label>
-                    <input id="comment-url" name="url" size="30" value="<MTIf name="comment_preview_template"><$MTCommentURL encode_html="1"$></MTIf>" />
-                </div>
-                <div id="comment-form-remember-me">
-                    <label for="comment-bake-cookie"><input type="checkbox" id="comment-bake-cookie" name="bakecookie" onclick="if (!this.checked) forgetMe(document.comments_form)" value="1" />
-                        <__trans phrase="Remember personal info?"></label>
-                </div>
-                <div id="comment-form-reply">
-                    <label for="comment-reply" id="comment-reply-label"><input type="checkbox" id="comment-reply" name="comment_reply" value="" onclick="setCommentParentID();" />
-                        <__trans phrase="Replying to"></label>
-                </div>
-            </div>
-            <div id="comments-open-text">
-                <label for="comment-text"><__trans phrase="Comments"> <MTIfAllowCommentHTML><__trans phrase="(You may use HTML tags for style)"></MTIfAllowCommentHTML></label>
-                <textarea id="comment-text" name="text" rows="15" cols="50"><MTIf name="comment_preview_template"><$MTCommentBody autolink="0" sanitize="0" convert_breaks="0" encode_html="1"$></MTIf></textarea>
-            </div>
-            <MTIfNonEmpty tag="MTCaptchaFields">
-            <MTIfCommentsAccepted><MTIfRegistrationAllowed><MTElse><$MTCaptchaFields$></MTIfRegistrationAllowed></MTIfCommentsAccepted>
-            <div id="comments-open-captcha">
-            </div>
-            </MTIfNonEmpty>
-            <div id="comments-open-footer">
-                <input type="submit" accesskey="v" name="preview" id="comment-preview" value="<__trans phrase="Preview">" />
-                <input type="submit" accesskey="s" name="post" id="comment-submit" value="<__trans phrase="Submit">" />
-    <MTIf name="comment_preview_template">
-                <input type="button" name="cancel" id="comment-cancel" value="<__trans phrase="Cancel">" onclick="window.location='<$MTEntryPermalink$>'" />
-    </MTIf>
-            </div>
-        </form>
-    </div>
-</div>
-</MTIfCommentsAccepted>
Index: branches/release-33/default_templates/entry_listing.mtml
===================================================================
--- branches/release-33/default_templates/entry_listing.mtml (revision 1463)
+++  (revision )
@@ -1,42 +1,0 @@
-<MTSetVarBlock name="body_class">mt-archive-listing mt-<MTVar name="archive_class"></MTSetVarBlock>
-<MTSetVar name="module_about_context" value="1">
-<MTSetVarBlock name="page_title"><__trans phrase="[_1] Archives" params="<$MTArchiveTitle$>"></MTSetVarBlock>
-<MTSetVarBlock name="title"><$MTBlogName encode_html="1"$>: <$MTGetVar name="page_title"$></MTSetVarBlock>
-<MTUnless name="datebased_archive"><$mt:setvar name="limit" value="auto"$></MTUnless>
-<MTIf name="datebased_archive">
-    <MTSetVarBlock name="html_head">
-        <MTArchivePrevious><link rel="prev" href="<$MTArchiveLink$>" title="<$MTArchiveTitle encode_html="1"$>" /></MTArchivePrevious>
-        <MTArchiveNext><link rel="next" href="<$MTArchiveLink$>" title="<$MTArchiveTitle encode_html="1"$>" /></MTArchiveNext>
-    </MTSetVarBlock>
-</MTIf>
-
-<$MTInclude module="<__trans phrase="Header">"$>
-
-<h1 id="page-title" class="archive-title">
-<MTUnless name="datebased_archive">
-    <MTIfArchiveType archive_type="Category">
-<__trans phrase="Recently in <em>[_1]</em> Category" params="<$MTArchiveTitle$>">
-    <MTElse archive_type="Author">
-<__trans phrase="Recently by <em>[_1]</em>" params="<$MTArchiveTitle$>">
-    </MTIfArchiveType>
-<MTElse>
-<$MTGetVar name="page_title"$>
-</MTUnless>
-</h1>
-
-<MTEntries limit="$limit">
-<$MTInclude module="<__trans phrase="Entry Summary">"$>
-</MTEntries>
-
-<div class="content-nav">
-    <MTArchivePrevious>
-    <a href="<$MTArchiveLink$>">&laquo; <$MTArchiveTitle$></a> |
-    </MTArchivePrevious>
-    <a href="<$MTLink template="main_index"$>"><__trans phrase="Main Index"></a> |
-    <a href="<$MTLink template="archive_index"$>"><__trans phrase="Archives"></a>
-    <MTArchiveNext>
-    | <a href="<$MTArchiveLink$>"><$MTArchiveTitle$> &raquo;</a>
-    </MTArchiveNext>
-</div>
-
-<$MTInclude module="<__trans phrase="Footer">"$>
Index: branches/release-33/default_templates/tags.mtml
===================================================================
--- branches/release-33/default_templates/tags.mtml (revision 1423)
+++  (revision )
@@ -1,8 +1,0 @@
-<MTEntryIfTagged>
-<div class="entry-tags">
-    <h4 class="entry-tags-header"><__trans phrase="Tags"><span class="delimiter">:</span></h4>
-    <ul class="entry-tags-list">
-        <li class="entry-tag"><MTEntryTags glue='<span class="delimiter">,</span></li> <li class="entry-tag">'><a href="<$MTTagSearchLink$>" rel="tag"><$MTTagName$></a></MTEntryTags></li>
-    </ul>
-</div>
-</MTEntryIfTagged>
Index: branches/release-33/default_templates/footer.mtml
===================================================================
--- branches/release-33/default_templates/footer.mtml (revision 1463)
+++  (revision )
@@ -1,27 +1,0 @@
-                        </div>
-                    </div>
-                <$MTInclude module="<__trans phrase="Sidebar">"$>
-                </div>
-            </div>
-            <div id="footer">
-                <div id="footer-inner">
-                    <div id="footer-content">
-                        <div class="widget-powered widget">
-                            <div class="widget-content">
-                                <__trans phrase="_POWERED_BY">
-                            </div>
-                        </div>
-<MTBlogIfCCLicense>
-                        <div class="widget-creative-commons widget">
-                            <div class="widget-content">
-                                <__trans phrase="This blog is licensed under a <a href="[_1]">Creative Commons License</a>." params="<$MTBlogCCLicenseURL$>">
-                            </div>
-                        </div>
-</MTBlogIfCCLicense>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>
Index: branches/release-33/default_templates/page_detail.mtml
===================================================================
--- branches/release-33/default_templates/page_detail.mtml (revision 1101)
+++  (revision )
@@ -1,18 +1,0 @@
-<div id="page-<$MTPageID$>" class="page-asset asset">
-    <div class="asset-header">
-        <h1 id="page-title" class="asset-name"><$MTPageTitle$></h1>
-    </div>
-    <div class="asset-content">
-<MTIfNonEmpty tag="PageBody">
-        <div class="asset-body">
-            <$MTPageBody$>
-        </div>
-</MTIfNonEmpty>
-<MTIfNonEmpty tag="PageMore" convert_breaks="0">
-        <div id="more" class="asset-more">
-            <$MTPageMore$>
-        </div>
-</MTIfNonEmpty>
-    </div>
-    <div class="asset-footer"></div>
-</div>
Index: branches/release-33/default_templates/entry_metadata.mtml
===================================================================
--- branches/release-33/default_templates/entry_metadata.mtml (revision 1463)
+++  (revision )
@@ -1,14 +1,0 @@
-<div class="asset-meta">
-    <span class="byline">
-<MTIfNonEmpty tag="EntryAuthorDisplayName">
-        <__trans phrase="By [_1] on [_2]" params="<span class="vcard author"><$MTEntryAuthorLink show_hcard="1"$></span>%%<abbr class="published" title="<$MTEntryDate format_name="iso8601"$>"><$MTEntryDate format="%x %X"$></abbr>">
-<MTElse>
-        <abbr class="published" title="<$MTEntryDate format_name="iso8601"$>"><$MTEntryDate format="%x %X"$></abbr>
-</MTIfNonEmpty>
-    </span>
-    <span class="separator">|</span> <a class="permalink" rel="bookmark" href="<$MTEntryPermalink$>"><__trans phrase="Permalink"></a>
-    <MTUnless name="hide_counts" eq="1">
-        <MTIfCommentsActive><span class="separator">|</span> <a href="<$MTEntryPermalink$>#comments"><__trans phrase="Comments ([_1])" params="<$MTEntryCommentCount$>"></a></MTIfCommentsActive>
-        <MTIfPingsActive><span class="separator">|</span> <a href="<$MTEntryPermalink$>#trackback"><__trans phrase="TrackBacks ([_1])" params="<$MTEntryTrackbackCount$>"></a></MTIfPingsActive>
-    </MTUnless>
-</div>
Index: branches/release-33/default_templates/categories.mtml
===================================================================
--- branches/release-33/default_templates/categories.mtml (revision 1286)
+++  (revision )
@@ -1,8 +1,0 @@
-<MTIfNonEmpty tag="EntryCategory">
-<div class="entry-categories">
-    <h4 class="entry-categories-header"><__trans phrase="Categories"><span class="delimiter">:</span></h4>
-    <ul class="entry-categories-list">
-        <li class="entry-category"><MTEntryCategories glue='<span class="delimiter">,</span></li> <li class="entry-category">'><a href="<$MTCategoryArchiveLink$>" rel="tag"><$MTCategoryLabel$></a></MTEntryCategories></li>
-    </ul>
-</div>
-</MTIfNonEmpty>
Index: branches/release-33/default_templates/header.mtml
===================================================================
--- branches/release-33/default_templates/header.mtml (revision 1463)
+++  (revision )
@@ -1,33 +1,0 @@
-<!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:var name="title"$></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=<$MTPublishCharset$>" />
-    <meta name="generator" content="<$MTProductName version="1"$>" />
-    <link rel="stylesheet" href="<$MTLink template="styles"$>" type="text/css" />
-    <link rel="start" href="<$MTBlogURL$>" title="Home" />
-    <link rel="alternate" type="application/atom+xml" title="Recent Entries" href="<$MTLink template="feed_recent"$>" />
-    <$MTCCLicenseRDF$>
-    <$mt:var name="html_head"$>
-</head>
-<body class="<MTIf name="body_class"><$MTVar name="body_class"$> </MTIf><$MTVar name="page_layout"$>"<MTIf name="body_onload"> onload="<$MTVar name="body_onload"$>"</MTIf>>
-    <div id="container">
-        <div id="container-inner">
-            <div id="header">
-                <div id="header-inner">
-                    <div id="header-content">
-<MTIf name="main_index">
-                        <h1 id="header-name"><a href="<$MTBlogURL$>" accesskey="1"><$MTBlogName encode_html="1"$></a></h1>
-                        <h2 id="header-description"><$MTBlogDescription$></h2>
-<MTElse>
-                        <div id="header-name"><a href="<$MTBlogURL$>" accesskey="1"><$MTBlogName encode_html="1"$></a></div>
-                        <div id="header-description"><$MTBlogDescription$></div>
-</MTIf>
-                    </div>
-                </div>
-            </div>
-            <div id="content">
-                <div id="content-inner">
-                    <div id="alpha">
-                        <div id="alpha-inner">
Index: branches/release-33/default_templates/sidebar_2col.mtml
===================================================================
--- branches/release-33/default_templates/sidebar_2col.mtml (revision 1503)
+++  (revision )
@@ -1,270 +1,0 @@
-<div id="beta">
-    <div id="beta-inner">
-        <div class="widget-search widget">
-            <h3 class="widget-header"><__trans phrase="Search"></h3>
-            <div class="widget-content">
-                <form method="get" action="<$MTCGIPath$><$MTSearchScript$>">
-                    <input id="search" name="search" size="20" value="<$MTSearchString$>" />
-                    <input type="hidden" name="limit" value="<MTSearchMaxResults>" />
-        <MTIf name="search_results_template">
-                    <input type="hidden" name="IncludeBlogs" value="<$MTSearchIncludeBlogs$>" />
-                    <MTIgnore>
-                    <!-- use these options only with MT::App::Search::Legacy -->
-                    <ul class="search-options">
-                        <li><input type="checkbox" name="CaseSearch" /> <__trans phrase="Case sensitive"></li>
-                        <li><input type="checkbox" name="RegexSearch" /> <__trans phrase="Regex search"></li>
-                    </ul>
-                    </MTIgnore>
-        <mt:else>
-                    <input type="hidden" name="IncludeBlogs" value="<$MTBlogID$>" />
-                    <input type="hidden" name="limit" value="<MTSearchMaxResults>" />
-        </mt:if>
-                    <input type="submit" value="<__trans phrase="Search">" />
-                </form>
-            </div>
-        </div>
-<MTIf name="search_results_template">
-    <MTIfTagSearch>
-        <div class="widget-tags widget">
-            <h3 class="widget-header"><__trans phrase="Tags"></h3>
-            <div class="widget-content">
-                <ul class="widget-list">
-        <MTTags>
-                    <li class="widget-list-item"><a href="<$MTTagSearchLink$>"><__trans phrase="[_1] ([_2])" params="<$MTTagName$>%%<$MTTagCount$>"></a></li>
-        </MTTags>
-                </ul>
-            </div>
-        </div>
-    </MTIfTagSearch>
-</MTIf>
-<MTIf name="module_about_context">
-        <div class="widget-about-this-page widget">
-            <h3 class="widget-header">
-    <MTIf name="entry_template">
-                <__trans phrase="About this Entry">
-    <MTElse>
-        <MTIf name="archive_template">
-                <__trans phrase="About this Archive">
-        </MTIf>
-    </MTIf>
-    <MTIf name="archive_index">
-                <__trans phrase="About Archives">
-    </MTIf>
-            </h3>
-            <div class="widget-content">
-    <MTIf name="archive_index">
-                <p><__trans phrase="This page contains links to all the archived content."></p>
-    </MTIf>
-    <MTIf name="entry_template">
-                <p class="first"><__trans phrase="This page contains a single entry by [_1] published on <em>[_2]</em>." params="<$MTEntryAuthorLink$>%%<$MTEntryDate format="%x %X"$>"></p>
-        <MTEntryPrevious>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> was the previous entry in this blog." params="<$MTEntryPermalink$>%%<$MTEntryTitle remove_html="1"$>"></p>
-        </MTEntryPrevious>
-        <MTEntryNext>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the next entry in this blog." params="<$MTEntryPermalink$>%%<$MTEntryTitle remove_html="1"$>"></p>
-        </MTEntryNext>
-    </MTIf>
-    <MTIf name="category_archive">
-        <MTIf name="datebased_archive">
-                <p class="first"><__trans phrase="This page is a archive of entries in the <strong>[_1]</strong> category from <strong>[_2]</strong>." params="<$MTCategoryLabel$>%%<$MTArchiveDate format="%B %Y"$>"></p>
-            <MTArchivePrevious>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the previous archive." params="<$MTArchiveLink$>%%<$MTArchiveTitle$>"></p>
-            </MTArchivePrevious>
-            <MTArchiveNext>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the next archive." params="<$MTArchiveLink$>%%<$MTArchiveTitle$>"></p>
-            </MTArchiveNext>
-        <MTElse>
-                <p class="first"><__trans phrase="This page is a archive of recent entries in the <strong>[_1]</strong> category." params="<$MTCategoryLabel$>"></p>
-            <MTCategoryPrevious>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the previous category." params="<$MTCategoryArchiveLink$>%%<$MTCategoryLabel$>"></p>
-            </MTCategoryPrevious>
-            <MTCategoryNext>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the next category." params="<$MTCategoryArchiveLink$>%%<$MTCategoryLabel$>"></p>
-            </MTCategoryNext>
-        </MTIf>
-    </MTIf>
-    <MTIf name="author_archive">
-        <MTIf name="datebased_archive">
-                <p class="first"><__trans phrase="This page is a archive of recent entries written by <strong>[_1]</strong> in <strong>[_2]</strong>." params="<$MTAuthorDisplayName$>%%<$MTArchiveDate format="%B %Y"$>"></p>
-            <MTArchivePrevious>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the previous archive." params="<$MTArchiveLink$>%%<$MTArchiveTitle$>"></p>
-            </MTArchivePrevious>
-            <MTArchiveNext>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the next archive." params="<$MTArchiveLink$>%%<$MTArchiveTitle$>"></p>
-            </MTArchiveNext>
-        <MTElse>
-                <p class="first"><__trans phrase="This page is a archive of recent entries written by <strong>[_1]</strong>." params="<$MTAuthorDisplayName$>"></p>
-        </MTIf>
-    </MTIf>
-    <MTIf name="datebased_only_archive">
-                <p class="first"><__trans phrase="This page is an archive of entries from <strong>[_2]</strong> listed from newest to oldest." params="<$MTBlogName$>%%<$MTArchiveDate format="%B %Y"$>"></p>
-        <MTArchivePrevious>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the previous archive." params="<$MTArchiveLink$>%%<$MTArchiveTitle$>"></p>
-        </MTArchivePrevious>
-        <MTArchiveNext>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the next archive." params="<$MTArchiveLink$>%%<$MTArchiveTitle$>"></p>
-        </MTArchiveNext>
-    </MTIf>
-    <MTIf name="archive_index">
-                <p><__trans phrase="Find recent content on the <a href="[_1]">main index</a>." params="<$MTBlogURL$>"></p>
-    <MTElse>
-                <p><__trans phrase="Find recent content on the <a href="[_1]">main index</a> or look in the <a href="[_2]">archives</a> to find all content." params="<$MTBlogURL$>%%<$MTLink template="archive_index"$>"></p>
-    </MTIf>
-            </div>
-        </div>
-</MTIf>
-<MTIf name="module_recent_entries">
-        <div class="widget-archive widget">
-            <h3 class="widget-header"><__trans phrase="Recent Entries"></h3>
-            <div class="widget-content">
-                <ul class="widget-list">
-    <MTEntries lastn="10">
-                    <li class="widget-list-item"><a href="<$MTEntryPermalink$>"><$MTEntryTitle$></a></li>
-    </MTEntries>
-                </ul>
-            </div>
-        </div>
-</MTIf>
-<MTIf name="main_index">
-    <MTIfNonZero tag="AssetCount">
-        <MTAssets type="image" lastn="10">
-            <MTAssetsHeader>
-        <div class="widget-recent-assets widget">
-            <h3 class="widget-header"><__trans phrase="Photos"></h3>
-            <div class="widget-content">
-                <ul class="widget-list"></MTAssetsHeader>
-                <li class="item"><a class="asset-image" href="<$MTAssetURL$>"><img src="<$MTAssetThumbnailURL height="70"$>" class="asset-img-thumb" alt="<$MTAssetLabel$>" title="<$MTAssetLabel$>" /></a></li>
-            <MTAssetsFooter></ul>
-            </div>
-        </div>
-            </MTAssetsFooter>
-        </MTAssets>
-    </MTIfNonZero>
-</MTIf> 
-<MTIf name="main_index">
-    <MTIfArchiveTypeEnabled archive_type="Category">
-        <div class="widget-categories widget">
-            <h3 class="widget-header"><__trans phrase="Categories"></h3>
-            <div class="widget-content">
-        <MTTopLevelCategories>
-            <MTSubCatIsFirst>
-                <ul class="widget-list">
-            </MTSubCatIsFirst>
-            <MTIfNonZero tag="MTCategoryCount">
-                    <li class="widget-list-item"><a href="<$MTCategoryArchiveLink$>"<MTIfNonEmpty tag="MTCategoryDescription"> title="<$MTCategoryDescription$>"</MTIfNonEmpty>><__trans phrase="[_1] ([_2])" params="<$MTCategoryLabel$>%%<$MTCategoryCount$>"></a>
-            <MTElse>
-                    <li class="widget-list-item"><$MTCategoryLabel$>
-            </MTIfNonZero>
-            <MTSubCatsRecurse>
-                    </li>
-            <MTSubCatIsLast>
-                </ul>
-            </MTSubCatIsLast>
-        </MTTopLevelCategories>
-            </div>
-        </div>
-    </MTIfArchiveTypeEnabled>
-</MTIf>
-<MTIf name="main_index">
-        <div class="widget-tag-cloud widget">
-            <h3 class="widget-header"><__trans phrase="Tag Cloud"></h3>
-            <div class="widget-content">
-                <ul class="widget-list">
-    <MTTags limit="20" sort_by="rank">
-                    <li class="rank-<$MTTagRank max="10"$> widget-list-item"><a href="<$MTTagSearchLink$>"><$MTTagName$></a></li>
-    </MTTags>
-                </ul>
-            </div>
-        </div>
-</MTIf>
-<MTIf name="main_index">
-    <MTIfArchiveTypeEnabled archive_type="Author">
-        <MTArchiveList archive_type="Author">
-            <MTArchiveListHeader>
-        <div class="widget-authors widget">
-            <h3 class="widget-header"><__trans phrase="Author Archives"></h3>
-            <div class="widget-content">
-                <ul class="widget-list">
-            </MTArchiveListHeader>
-                    <li class="widget-list-item"><a href="<$MTArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$MTArchiveTitle$>%%<$MTArchiveCount$>"></a></li>
-            <MTArchiveListFooter>
-                </ul>
-            </div>
-        </div>
-            </MTArchiveListFooter>
-        </MTArchiveList>
-    </MTIfArchiveTypeEnabled>
-</MTIf>
-<MTIf name="main_index">
-    <MTIfArchiveTypeEnabled archive_type="Monthly">
-        <MTArchiveList archive_type="Monthly">
-            <MTArchiveListHeader>
-        <div class="widget-archive widget">
-            <h3 class="widget-header"><__trans phrase="[_1] <a href="[_2]">Archives</a>" params="<$MTArchiveTypeLabel$>%%<$MTLink template="archive_index"$>"></h3>
-            <div class="widget-content">
-                <ul class="widget-list">
-            </MTArchiveListHeader>
-                    <li class="widget-list-item"><a href="<$MTArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$MTArchiveTitle$>%%<$MTArchiveCount$>"></a></li>
-            <MTArchiveListFooter>
-                </ul>
-            </div>
-        </div>
-            </MTArchiveListFooter>
-        </MTArchiveList>
-    </MTIfArchiveTypeEnabled>
-</MTIf>
-<MTIf name="module_category-monthly_archives">
-    <MTIfArchiveTypeEnabled archive_type="Category-Monthly">
-        <div class="widget-categories widget">
-            <h3 class="widget-header"><__trans phrase="[_1]: Monthly Archives" params="<$MTArchiveTitle$>"></h3>
-            <div class="widget-content">
-        <MTArchiveList archive_type="Category-Monthly">
-            <MTArchiveListHeader>
-                <ul class="widget-list">
-            </MTArchiveListHeader>
-                    <li class="widget-list-item"><a href="<$MTArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$MTArchiveTitle$>%%<$MTArchiveCount$>"></a></li>
-            <MTArchiveListFooter>
-                </ul>
-            </MTArchiveListFooter>
-        </MTArchiveList>
-            </div>
-        </div>
-    </MTIfArchiveTypeEnabled>
-</MTIf>
-<MTIf name="module_author-monthly_archives">
-    <MTIfArchiveTypeEnabled archive_type="Author-Monthly">
-        <MTArchiveList archive_type="Author-Monthly">
-            <MTArchiveListHeader>
-        <div class="widget-categories widget">
-            <h3 class="widget-header"><__trans phrase="[_1]: Monthly Archives" params="<$MTAuthorDisplayName$>"></h3>
-            <div class="widget-content">
-                <ul class="widget-list">
-            </MTArchiveListHeader>
-                    <li class="widget-list-item"><a href="<$MTArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$MTArchiveTitle$>%%<$MTArchiveCount$>"></a></li>
-            <MTArchiveListFooter>
-                </ul>
-            </MTArchiveListFooter>
-        </MTArchiveList>
-            </div>
-        </div>
-    </MTIfArchiveTypeEnabled>
-</MTIf>
-        <div class="widget-syndicate widget">
-            <div class="widget-content">
-                <ul class="blog-feeds">
-                    <li class="blog feed"><img src="<$MTStaticWebPath$>images/status_icons/feed.gif" alt="<__trans phrase="Subscribe to feed">" width="9" height="9" /> <a href="<$MTLink template="feed_recent"$>"><__trans phrase="Subscribe to this blog's feed"></a></li>
-    <MTIf name="search_results_template">
-        <mt:ifnonempty tag="MTSearchString">
-                    <li class="search-results-feed"><img src="<$MTStaticWebPath$>images/status_icons/feed.gif" alt="<__trans phrase="Subscribe to feed">" width="9" height="9" /> <a href="<$MTCGIPath$><$MTSearchScript$>?<MTIfTagSearch>tag<MTElse>search</MTIfTagSearch>=<$MTSearchString encode_url="1"$>&amp;Template=feed&amp;IncludeBlogs=<$MTSearchIncludeBlogs$>&amp;limit=<MTSearchMaxResults>" title="<__trans phrase="Subscribe to feed">"><__trans phrase="Search results matching &ldquo;<$MTSearchString$>&rdquo;"></a></li>
-        </mt:ifnonempty>
-    </MTIf>
-                </ul>
-            </div>
-        </div>
-        <div class="widget-powered widget">
-            <div class="widget-content">
-                <a href="<__trans phrase="_MTCOM_URL">"><img src="<$MTStaticWebPath$>images/mt4-bug-pbmt-white.png" alt="<__trans phrase="Powered by Movable Type [_1]" params="<$MTVersion$>">" width="120" height="75" /></a>
-            </div>
-        </div>
-    </div>
-</div>
Index: branches/release-33/default_templates/sidebar_3col.mtml
===================================================================
--- branches/release-33/default_templates/sidebar_3col.mtml (revision 1503)
+++  (revision )
@@ -1,272 +1,0 @@
-<div id="beta">
-    <div id="beta-inner">
-<MTIf name="module_about_context">
-        <div class="widget-about-this-page widget">
-            <h3 class="widget-header">
-    <MTIf name="entry_template">
-                <__trans phrase="About this Entry">
-    <MTElse>
-        <MTIf name="archive_template">
-                <__trans phrase="About this Archive">
-        </MTIf>
-    </MTIf>
-    <MTIf name="archive_index">
-                <__trans phrase="About Archives">
-    </MTIf>
-            </h3>
-            <div class="widget-content">
-    <MTIf name="archive_index">
-                <p><__trans phrase="This page contains links to all the archived content."></p>
-    </MTIf>
-    <MTIf name="entry_template">
-                <p class="first"><__trans phrase="This page contains a single entry by [_1] published on <em>[_2]</em>." params="<$MTEntryAuthorLink$>%%<$MTEntryDate format="%x %X"$>"></p>
-        <MTEntryPrevious>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> was the previous entry in this blog." params="<$MTEntryPermalink$>%%<$MTEntryTitle remove_html="1"$>"></p>
-        </MTEntryPrevious>
-        <MTEntryNext>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the next entry in this blog." params="<$MTEntryPermalink$>%%<$MTEntryTitle remove_html="1"$>"></p>
-        </MTEntryNext>
-    </MTIf>
-    <MTIf name="category_archive">
-        <MTIf name="datebased_archive">
-                <p class="first"><__trans phrase="This page is a archive of entries in the <strong>[_1]</strong> category from <strong>[_2]</strong>." params="<$MTCategoryLabel$>%%<$MTArchiveDate format="%B %Y"$>"></p>
-            <MTArchivePrevious>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the previous archive." params="<$MTArchiveLink$>%%<$MTArchiveTitle$>"></p>
-            </MTArchivePrevious>
-            <MTArchiveNext>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the next archive." params="<$MTArchiveLink$>%%<$MTArchiveTitle$>"></p>
-            </MTArchiveNext>
-        <MTElse>
-                <p class="first"><__trans phrase="This page is a archive of recent entries in the <strong>[_1]</strong> category." params="<$MTCategoryLabel$>"></p>
-            <MTCategoryPrevious>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the previous category." params="<$MTCategoryArchiveLink$>%%<$MTCategoryLabel$>"></p>
-            </MTCategoryPrevious>
-            <MTCategoryNext>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the next category." params="<$MTCategoryArchiveLink$>%%<$MTCategoryLabel$>"></p>
-            </MTCategoryNext>
-        </MTIf>
-    </MTIf>
-    <MTIf name="author_archive">
-        <MTIf name="datebased_archive">
-                <p class="first"><__trans phrase="This page is a archive of recent entries written by <strong>[_1]</strong> in <strong>[_2]</strong>." params="<$MTAuthorDisplayName$>%%<$MTArchiveDate format="%B %Y"$>"></p>
-            <MTArchivePrevious>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the previous archive." params="<$MTArchiveLink$>%%<$MTArchiveTitle$>"></p>
-            </MTArchivePrevious>
-            <MTArchiveNext>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the next archive." params="<$MTArchiveLink$>%%<$MTArchiveTitle$>"></p>
-            </MTArchiveNext>
-        <MTElse>
-                <p class="first"><__trans phrase="This page is a archive of recent entries written by <strong>[_1]</strong>." params="<$MTAuthorDisplayName$>"></p>
-        </MTIf>
-    </MTIf>
-    <MTIf name="datebased_only_archive">
-                <p class="first"><__trans phrase="This page is an archive of entries from <strong>[_2]</strong> listed from newest to oldest." params="<$MTBlogName$>%%<$MTArchiveDate format="%B %Y"$>"></p>
-        <MTArchivePrevious>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the previous archive." params="<$MTArchiveLink$>%%<$MTArchiveTitle$>"></p>
-        </MTArchivePrevious>
-        <MTArchiveNext>
-                <p><__trans phrase="<a href="[_1]">[_2]</a> is the next archive." params="<$MTArchiveLink$>%%<$MTArchiveTitle$>"></p>
-        </MTArchiveNext>
-    </MTIf>
-    <MTIf name="archive_index">
-                <p><__trans phrase="Find recent content on the <a href="[_1]">main index</a>." params="<$MTBlogURL$>"></p>
-    <MTElse>
-                <p><__trans phrase="Find recent content on the <a href="[_1]">main index</a> or look in the <a href="[_2]">archives</a> to find all content." params="<$MTBlogURL$>%%<$MTLink template="archive_index"$>"></p>
-    </MTIf>
-            </div>
-        </div>
-</MTIf>
-<MTIf name="main_index">
-        <div class="widget-tag-cloud widget">
-            <h3 class="widget-header"><__trans phrase="Tag Cloud"></h3>
-            <div class="widget-content">
-                <ul class="widget-list">
-    <MTTags limit="20" sort_by="rank">
-                    <li class="rank-<$MTTagRank max="10"$> widget-list-item"><a href="<$MTTagSearchLink$>"><$MTTagName$></a></li>
-    </MTTags>
-                </ul>
-            </div>
-        </div>
-</MTIf>
-<MTIf name="main_index">
-    <MTIfArchiveTypeEnabled archive_type="Author">
-        <MTArchiveList archive_type="Author">
-            <MTArchiveListHeader>
-        <div class="widget-authors widget">
-            <h3 class="widget-header"><__trans phrase="Author Archives"></h3>
-            <div class="widget-content">
-                <ul class="widget-list">
-            </MTArchiveListHeader>
-                    <li class="widget-list-item"><a href="<$MTArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$MTArchiveTitle$>%%<$MTArchiveCount$>"></a></li>
-            <MTArchiveListFooter>
-                </ul>
-            </div>
-        </div>
-            </MTArchiveListFooter>
-        </MTArchiveList>
-    </MTIfArchiveTypeEnabled>
-</MTIf>
-<MTIf name="main_index">
-    <MTIfArchiveTypeEnabled archive_type="Monthly">
-        <MTArchiveList archive_type="Monthly">
-            <MTArchiveListHeader>
-        <div class="widget-archive widget">
-            <h3 class="widget-header"><__trans phrase="[_1] <a href="[_2]">Archives</a>" params="<$MTArchiveTypeLabel$>%%<$MTLink template="archive_index"$>"></h3>
-            <div class="widget-content">
-                <ul class="widget-list">
-            </MTArchiveListHeader>
-                    <li class="widget-list-item"><a href="<$MTArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$MTArchiveTitle$>%%<$MTArchiveCount$>"></a></li>
-            <MTArchiveListFooter>
-                </ul>
-            </div>
-        </div>
-            </MTArchiveListFooter>
-        </MTArchiveList>
-    </MTIfArchiveTypeEnabled>
-</MTIf>
-<MTIf name="module_category-monthly_archives">
-    <MTIfArchiveTypeEnabled archive_type="Category-Monthly">
-        <div class="widget-categories widget">
-            <h3 class="widget-header"><__trans phrase="[_1]: Monthly Archives" params="<$MTArchiveTitle$>"></h3>
-            <div class="widget-content">
-        <MTArchiveList archive_type="Category-Monthly">
-            <MTArchiveListHeader>
-                <ul class="widget-list">
-            </MTArchiveListHeader>
-                    <li class="widget-list-item"><a href="<$MTArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$MTArchiveTitle$>%%<$MTArchiveCount$>"></a></li>
-            <MTArchiveListFooter>
-                </ul>
-            </MTArchiveListFooter>
-        </MTArchiveList>
-            </div>
-        </div>
-    </MTIfArchiveTypeEnabled>
-</MTIf>
-<MTIf name="module_author-monthly_archives">
-    <MTIfArchiveTypeEnabled archive_type="Author-Monthly">
-        <MTArchiveList archive_type="Author-Monthly">
-            <MTArchiveListHeader>
-        <div class="widget-categories widget">
-            <h3 class="widget-header"><__trans phrase="[_1]: Monthly Archives" params="<$MTAuthorDisplayName$>"></h3>
-            <div class="widget-content">
-                <ul class="widget-list">
-            </MTArchiveListHeader>
-                    <li class="widget-list-item"><a href="<$MTArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$MTArchiveTitle$>%%<$MTArchiveCount$>"></a></li>
-            <MTArchiveListFooter>
-                </ul>
-            </MTArchiveListFooter>
-        </MTArchiveList>
-            </div>
-        </div>
-    </MTIfArchiveTypeEnabled>
-</MTIf>
-        <div class="widget-syndicate widget">
-            <div class="widget-content">
-                <ul class="blog-feeds">
-                    <li class="blog feed"><img src="<$MTStaticWebPath$>images/status_icons/feed.gif" alt="<__trans phrase="Subscribe to feed">" width="9" height="9" /> <a href="<$MTLink template="feed_recent"$>"><__trans phrase="Subscribe to this blog's feed"></a></li>
-    <MTIf name="search_results_template">
-        <mt:ifnonempty tag="MTSearchString">
-                    <li class="search-results-feed"><img src="<$MTStaticWebPath$>images/status_icons/feed.gif" alt="<__trans phrase="Subscribe to feed">" width="9" height="9" /> <a href="<$MTCGIPath$><$MTSearchScript$>?<MTIfTagSearch>tag<MTElse>search</MTIfTagSearch>=<$MTSearchString encode_url="1"$>&amp;Template=feed&amp;IncludeBlogs=<$MTSearchIncludeBlogs$>&amp;limit=<MTSearchMaxResults>" title="<__trans phrase="Subscribe to feed">"><__trans phrase="Search results matching &ldquo;<$MTSearchString$>&rdquo;"></a></li>
-        </mt:ifnonempty>
-    </MTIf>
-                </ul>
-            </div>
-        </div>
-        <div class="widget-powered widget">
-            <div class="widget-content">
-                <a href="<__trans phrase="_MTCOM_URL">"><img src="<$MTStaticWebPath$>images/mt4-bug-pbmt-white.png" alt="<__trans phrase="Powered by Movable Type [_1]" params="<$MTVersion$>">" width="120" height="75" /></a>
-            </div>
-        </div>
-    </div>
-</div>
-<div id="gamma">
-    <div id="gamma-inner">
-        <div class="widget-search widget">
-            <h3 class="widget-header"><__trans phrase="Search"></h3>
-            <div class="widget-content">
-                <form method="get" action="<$MTCGIPath$><$MTSearchScript$>">
-                    <input id="search" name="search" size="20" value="<$MTSearchString$>" />
-        <MTIf name="search_results_template">
-                    <input type="hidden" name="IncludeBlogs" value="<$MTSearchIncludeBlogs$>" />
-                    <MTIgnore>
-                    <!-- use these options only with MT::App::Search::Legacy -->
-                    <ul class="search-options">
-                        <li><input type="checkbox" name="CaseSearch" /> <__trans phrase="Case sensitive"></li>
-                        <li><input type="checkbox" name="RegexSearch" /> <__trans phrase="Regex search"></li>
-                    </ul>
-                    </MTIgnore>
-        <mt:else>
-                    <input type="hidden" name="IncludeBlogs" value="<$MTBlogID$>" />
-        </mt:if>
-                    <input type="submit" value="<__trans phrase="Search">" />
-                </form>
-            </div>
-        </div>
-<MTIf name="search_results_template">
-    <MTIfTagSearch>
-        <div class="widget-tags widget">
-            <h3 class="widget-header"><__trans phrase="Tags"></h3>
-            <div class="widget-content">
-                <ul class="widget-list">
-        <MTTags>
-                    <li class="widget-list-item"><a href="<$MTTagSearchLink$>"><__trans phrase="[_1] ([_2])" params="<$MTTagName$>%%<$MTTagCount$>"></a></li>
-        </MTTags>
-                </ul>
-            </div>
-        </div>
-    </MTIfTagSearch>
-</MTIf>
-<MTIf name="module_recent_entries">
-        <div class="widget-archive widget">
-            <h3 class="widget-header"><__trans phrase="Recent Entries"></h3>
-            <div class="widget-content">
-                <ul class="widget-list">
-    <MTEntries lastn="10">
-                    <li class="widget-list-item"><a href="<$MTEntryPermalink$>"><$MTEntryTitle$></a></li>
-    </MTEntries>
-                </ul>
-            </div>
-        </div>
-</MTIf>
-<MTIf name="main_index">
-    <MTIfNonZero tag="AssetCount">
-        <MTAssets type="image" lastn="10">
-            <MTAssetsHeader>
-        <div class="widget-recent-assets widget">
-            <h3 class="widget-header"><__trans phrase="Photos"></h3>
-            <div class="widget-content">
-                <ul class="widget-list"></MTAssetsHeader>
-                <li class="item"><a class="asset-image" href="<$MTAssetURL$>"><img src="<$MTAssetThumbnailURL height="70"$>" class="asset-img-thumb" alt="<$MTAssetLabel$>" title="<$MTAssetLabel$>" /></a></li>
-            <MTAssetsFooter></ul>
-            </div>
-        </div>
-            </MTAssetsFooter>
-        </MTAssets>
-    </MTIfNonZero>
-</MTIf> 
-<MTIf name="main_index">
-    <MTIfArchiveTypeEnabled archive_type="Category">
-        <div class="widget-categories widget">
-            <h3 class="widget-header"><__trans phrase="Categories"></h3>
-            <div class="widget-content">
-        <MTTopLevelCategories>
-            <MTSubCatIsFirst>
-                <ul class="widget-list">
-            </MTSubCatIsFirst>
-            <MTIfNonZero tag="MTCategoryCount">
-                    <li class="widget-list-item"><a href="<$MTCategoryArchiveLink$>"<MTIfNonEmpty tag="MTCategoryDescription"> title="<$MTCategoryDescription$>"</MTIfNonEmpty>><__trans phrase="[_1] ([_2])" params="<$MTCategoryLabel$>%%<$MTCategoryCount$>"></a>
-            <MTElse>
-                    <li class="widget-list-item"><$MTCategoryLabel$>
-            </MTIfNonZero>
-            <MTSubCatsRecurse>
-                    </li>
-            <MTSubCatIsLast>
-                </ul>
-            </MTSubCatIsLast>
-        </MTTopLevelCategories>
-            </div>
-        </div>
-    </MTIfArchiveTypeEnabled>
-</MTIf>
-    </div>
-</div>
Index: branches/release-33/default_templates/base_theme.mtml
===================================================================
--- branches/release-33/default_templates/base_theme.mtml (revision 1104)
+++  (revision )
@@ -1,452 +1,0 @@
-/* Base Theme ============================================================= */
-
-/* Reset ------------------------------------------------------------------ */
-
-/*
-    reset.css - resets default browser styling
-    http://tantek.com/log/2004/09.html#d06t2354
-    http://www.vox.com/.shared/css/base.css by beausmith.com
-    http://developer.yahoo.com/yui/reset/
-*/
-
-:link,:visited {
-    text-decoration: none;
-}
-html,body,div,
-ul,ol,li,dl,dt,dd,
-form,fieldset,input,textarea,
-h1,h2,h3,h4,h5,h6,pre,code,p,blockquote,hr,
-th,td {
-    margin: 0;
-    padding: 0;
-}
-h1,h2,h3,h4,h5,h6 {
-    font-size: 100%;
-    font-weight: normal;
-}
-table {
-    border-spacing: 0;
-}
-fieldset,img,abbr,acronym {
-    border: 0;
-} 
-/* strict reset by uncommenting lines below */
-address,caption,cite,code,dfn,em,strong,b,u,s,i,th,var {
-    /* font-style: normal; */
-    /* font-weight: normal; */
-}
-
-ol,ul {
-    list-style: none;
-}
-caption,th {
-    text-align: left;
-}
-q:before,q:after {
-    content: '';
-}
-a {
-    text-decoration: underline;
-    outline: none;
-}
-hr {
-    border: 0;
-    height: 1px;
-    background-color: #000;
-    color: #000;
-}
-a img,:link img,:visited img {
-    border: none;
-}
-address {
-    font-style: normal;
-    display: inline;
-}
-
-
-/* Layout ----------------------------------------------------------------- */
-
-body {
-    text-align: center;
-    background: #fff;
-}
-
-#container-inner {
-    width: 940px;
-    min-height: 100%;
-    margin: 0 auto;
-    text-align: left;
-}
-
-#header, #content, #alpha, #beta, #gamma, #footer {
-    position: relative;
-}
-
-#alpha, #beta, #gamma {
-    display: inline;
-    float: left;
-}
-
-#header-inner, #content-inner, #footer-inner,
-#alpha-inner, #beta-inner, #gamma-inner {
-    position: static;
-}
-
-#header-inner, #content-inner, #footer-inner {
-    padding-top: 20px;
-    padding-bottom: 20px;
-}
-
-#header-inner, #footer-inner,
-#alpha-inner, #beta-inner, #gamma-inner {
-    overflow: hidden;
-    padding-right: 20px;
-    padding-left: 20px;
-}
-
-
-/* Wide-Thin-Thin */
-
-.layout-wtt #alpha {
-    width: 560px;
-}
-
-.layout-wtt #beta {
-    left: 190px;
-    width: 190px;
-}
-
-.layout-wtt #gamma {
-    right: 190px;
-    width: 190px;
-}
-
-
-/* Thin-Wide-Thin */
-
-.layout-twt #alpha {
-    left: 190px;
-    width: 560px;
-}
-
-.layout-twt #beta {
-    left: -560px;
-    width: 190px;
-}
-
-.layout-twt #gamma {
-    width: 190px;
-}
-
-
-/* Wide-Thin */
-
-.layout-wt #alpha {
-    width: 750px;
-}
-
-.layout-wt #beta {
-    width: 190px;
-}
-
-
-/* Thin-Wide */
-
-.layout-tw #alpha {
-    left: 190px;
-    width: 750px;
-}
-
-.layout-tw #beta {
-    left: -750px;
-    width: 190px;
-}
-
-
-/* Utilities */
-
-.pkg:after, #content-inner:after {
-    content: " ";
-    display: block;
-    visibility: hidden;
-    clear: both;
-    height: 0.1px;
-    font-size: 0.1em;
-    line-height: 0;
-}
-.pkg, #content-inner { display: inline-block; }
-/* no ie mac \*/
-* html .pkg, * html #content-inner { height: 1%; }
-.pkg, #content-inner { display: block; }
-/* */
-
-
-/* Content ---------------------------------------------------------------- */
-
-a:link, a:visited {
-    text-decoration: underline;
-}
-
-h1, h2, h3, h4, h5, h6, p, pre, blockquote, fieldset, ul, ol, dl {
-    margin-bottom: .75em;
-}
-
-blockquote, ol, ul {
-    margin-left: 30px;
-    background-repeat: repeat-y;
-}
-
-ol { list-style: decimal outside; }
-ul { list-style: disc outside; }
-.item { list-style: none; }
-
-
-/* Header */
-
-#header-name {
-    margin-bottom: .25em;
-}
-
-#header-description {
-    margin-bottom: 0;
-}
-
-
-/* Assets */
-
-.asset-body,
-.asset-more,
-.asset-more-link,
-.asset-excerpt,
-.comment-content,
-.comment-footer,
-.comments-open-content,
-.comments-open-footer,
-.comments-closed,
-.trackbacks-info,
-.trackback-content,
-.trackback-footer,
-.archive-content {
-    clear: both;
-}
-
-.asset,
-.comments,
-.trackbacks,
-.archive {
-    overflow: hidden;
-    width: 100%;
-}
-
-.asset,
-.asset-content,
-.comments,
-.trackbacks,
-.archive {
-    position: static;
-    clear: both;
-}
-
-.asset,
-.comments,
-.comments-content,
-.trackbacks,
-.archive,
-.search-form {
-    margin-bottom: 1.5em;
-}
-
-.asset-header,
-.asset-content,
-.asset-body,
-.comments-header,
-.comment-header,
-.comment-content,
-.comment-footer,
-.comments-open-header,
-.comments-open-content,
-#comments-open-footer,
-.comments-closed,
-#comment-form-external-auth,
-.comments-open-moderated,
-#comment-form-name,
-#comment-form-email,
-#comment-form-url,
-#comment-form-remember-me,
-#comments-open-text,
-.trackbacks-header,
-.trackbacks-info,
-.trackback-content,
-.trackback-footer,
-.archive-content,
-.search-form-header,
-.search-results-header {
-    margin-bottom: .75em;
-}
-
-.entry-categories,
-.entry-tags {
-    margin-bottom: .5em;
-}
-
-.asset-name {
-    margin-bottom: .25em;
-}
-
-.asset-footer,
-.asset-meta {
-    font-size: 11px;
-}
-
-.asset-meta {
-    margin-top: .25em;
-    padding-top: 2px;
-    padding-bottom: .3em;
-    font-weight: normal;
-}
-
-.asset-footer {
-    clear: both;
-    margin-top: 1.5em;
-    padding-top: .5em;
-}
-
-.content-nav {
-    text-align: center;
-}
-
-.entry-tags-header,
-.entry-categories-header {
-    margin-bottom: 0;
-    margin-right: .25em;
-    display: inline;
-    font-weight: bold;
-}
-
-.entry-tags-list,
-.entry-categories-list {
-    display: inline;
-    list-style: none;
-    margin-left: 0;
-    padding-left: 0;
-}
-.entry-tags-list .entry-tag,
-.entry-categories-list .entry-category {
-    display: inline;
-}
-
-.mt-image-left {
-    float: left;
-    margin: 0 20px 20px 0;
-}
-
-.mt-image-center {
-    display: block;
-    margin: 0 auto 20px;
-    text-align: center;
-}
-
-.mt-image-right {
-    float: right;
-    margin: 0 0 20px 20px;
-}
-
-
-/* Feedback */
-
-.comments-open label {
-    display: block;
-}
-
-#comment-author, #comment-email, #comment-url, #comment-text {
-    width: 80%;
-}
-
-#comment-bake-cookie {
-    margin-left: 0;
-    vertical-align: middle;
-}
-
-#comment-submit {
-    font-weight: bold;
-}
-
-
-/* Widgets */
-
-.widget {
-    position: relative;
-    overflow: hidden;
-    width: 100%;
-}
-
-.widget-content {
-    position: relative;
-    margin: 5px 0 20px;
-}
-
-.widget-list,
-.archive-list {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-}
-
-.widget-list .widget-list {
-    margin-left: 15px;
-}
-
-.widget-list-item {
-    margin-top: 5px;
-    margin-bottom: 5px;
-}
-
-.widget-tag-cloud .widget-list {
-    margin-right: 0;
-    margin-left: 0;
-}
-
-.widget-tag-cloud .widget-list-item {
-    display: inline;
-    margin: 0 5px 0 0;
-    padding: 0;
-    line-height: 1.2;
-    background: none;
-}
-
-.widget-tag-cloud .rank-1  { font-size: 1.75em; }
-.widget-tag-cloud .rank-2  { font-size: 1.75em; }
-.widget-tag-cloud .rank-3  { font-size: 1.625em; }
-.widget-tag-cloud .rank-4  { font-size: 1.5em; }
-.widget-tag-cloud .rank-5  { font-size: 1.375em; }
-.widget-tag-cloud .rank-6  { font-size: 1.25em; }
-.widget-tag-cloud .rank-7  { font-size: 1.125em; }
-.widget-tag-cloud .rank-8  { font-size: 1em; }
-.widget-tag-cloud .rank-9  { font-size: 0.95em; }
-.widget-tag-cloud .rank-10 { font-size: 0.9em; }
-
-#footer .widget-content {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
-.widget-recent-assets .widget-content .widget-list {
-    overflow: auto;
-    margin-right: 0;
-}
-
-.item {
-    display: inline;
-    float: left;
-    margin: 0pt 5px 8px;
-    overflow: hidden;
-    text-align: center;
-    vertical-align: middle;
-    width: 70px;
-}
-
-.widget-search .search-options,
-.widget-syndicate .blog-feeds  {
-    list-style: none;
-    margin: 5px 0;
-}
