Index: branches/release-30/default_templates/main_index.mtml
===================================================================
--- branches/release-30/default_templates/main_index.mtml (revision 1104)
+++ branches/release-30/default_templates/main_index.mtml (revision 1423)
@@ -3,4 +3,8 @@
 <MTSetVar name="main_index" value="1">
 <MTSetVar name="sidebar" value="1">
+<mt:setvarblock name="html_head">
+    <link rel="EditURI" type="application/rsd+xml" title="RSD" href="<$MTLink template="rsd"$>" />
+</mt:setvarblock>
+</MTIf>
 <MTSetVarBlock name="title"><$MTBlogName encode_html="1"$></MTSetVarBlock>
 
@@ -8,5 +12,4 @@
 
 <MTEntries>
-    <$MTEntryTrackbackData$>
     <$MTInclude module="<__trans phrase="Entry Summary">"$>
 </MTEntries>
Index: branches/release-30/default_templates/entry_summary.mtml
===================================================================
--- branches/release-30/default_templates/entry_summary.mtml (revision 1101)
+++ branches/release-30/default_templates/entry_summary.mtml (revision 1423)
@@ -1,2 +1,3 @@
+<MTIfPingsAccepted><$MTEntryTrackbackData$></MTIfPingsAccepted>
 <div id="entry-<$MTEntryID$>" class="entry-asset asset hentry">
     <div class="asset-header">
Index: branches/release-30/default_templates/comment_response.mtml
===================================================================
--- branches/release-30/default_templates/comment_response.mtml (revision 1139)
+++ branches/release-30/default_templates/comment_response.mtml (revision 1423)
@@ -1,43 +1,19 @@
 <MTSetVar name="system_template" value="1">
-
 <MTIf name="body_class" eq="mt-comment-confirmation">
-    <MTSetVarBlock name="page_title"><__trans phrase="Comment Submitted"></MTSetVarBlock>
-
-    <MTSetVar name="heading" value="<__trans phrase="Confirmation...">">
-
-    <MTSetVarBlock name="message">
-    <p><__trans phrase="Your comment has been submitted!"></p>
-    </MTSetVarBlock>
+    <MTSetVar name="page_title" value="<__trans phrase="Confirmation...">">
+    <MTSetVar name="page_title" value="<__trans phrase="Confirmation...">">
+    <MTSetVarBlock name="message"><__trans phrase="Your comment has been submitted!"></MTSetVarBlock>
+<MTElse name="body_class" eq="mt-comment-pending">
+    <MTSetVarBlock name="page_title"><__trans phrase="Thank you for commenting."></MTSetVarBlock>
+    <MTSetVarBlock name="message"><__trans phrase="Your comment has been received and held for approval by the blog owner."></MTSetVarBlock>
+<MTElse name="body_class" eq="mt-comment-error">
+    <MTSetVarBlock name="page_title"><__trans phrase="Comment Submission Error"></MTSetVarBlock>
+    <MTSetVarBlock name="message"><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$MTErrorMessage$>"></MTSetVarBlock>
 </MTIf>
-
-<MTIf name="body_class" eq="mt-comment-pending">
-    <MTSetVarBlock name="page_title"><__trans phrase="Comment Pending"></MTSetVarBlock>
-
-    <MTSetVar name="heading" value="<__trans phrase="Thank you for commenting.">">
-
-    <MTSetVarBlock name="message">
-    <p><__trans phrase="Your comment has been received and held for approval by the blog owner."></p>
-    </MTSetVarBlock>
-
-</MTIf>
-
-<MTIf name="body_class" eq="mt-comment-error">
-    <MTSetVarBlock name="page_title"><__trans phrase="Comment Submission Error"></MTSetVarBlock>
-
-    <MTSetVar name="heading" value="$page_title">
-
-    <MTSetVarBlock name="message">
-    <p><__trans phrase="Your comment submission failed for the following reasons:"></p>
-    <blockquote>
-        <$MTErrorMessage$>
-    </blockquote>
-    </MTSetVarBlock>
-</MTIf>
-
 <MTSetVarBlock name="title"><$MTBlogName encode_html="1"$>: <$MTGetVar name="page_title"$></MTSetVarBlock>
 
 <$MTInclude module="<__trans phrase="Header">"$>
 
-<h1 id="page-title"><$MTGetVar name="heading"$></h1>
+<h1 id="page-title"><$MTGetVar name="page_title"$></h1>
 
 <$MTGetVar name="message"$>
Index: branches/release-30/default_templates/entry_detail.mtml
===================================================================
--- branches/release-30/default_templates/entry_detail.mtml (revision 1101)
+++ branches/release-30/default_templates/entry_detail.mtml (revision 1423)
@@ -17,8 +17,6 @@
     </div>
     <div class="asset-footer">
-        <MTIf name="entry_template">
-                <$MTInclude module="<__trans phrase="Categories">"$>
-        </MTIf>
-                <$MTInclude module="<__trans phrase="Tags">"$>
+        <$MTInclude module="<__trans phrase="Categories">"$>
+        <$MTInclude module="<__trans phrase="Tags">"$>
     </div>
 </div>
Index: branches/release-30/default_templates/entry_listing.mtml
===================================================================
--- branches/release-30/default_templates/entry_listing.mtml (revision 1102)
+++ branches/release-30/default_templates/entry_listing.mtml (revision 1423)
@@ -4,4 +4,5 @@
 <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">
@@ -17,6 +18,5 @@
     <MTIfArchiveType archive_type="Category">
 <__trans phrase="Recently in <em>[_1]</em> Category" params="<$MTArchiveTitle$>">
-    </MTIfArchiveType>
-    <MTIfArchiveType archive_type="Author">
+    <MTElse archive_type="Author">
 <__trans phrase="Recently by <em>[_1]</em>" params="<$MTArchiveTitle$>">
     </MTIfArchiveType>
@@ -26,15 +26,7 @@
 </h1>
 
-<MTIf name="datebased_archive">
-    <MTEntries>
-<$MTEntryTrackbackData$>
+<MTEntries limit="$limit">
 <$MTInclude module="<__trans phrase="Entry Summary">"$>
-    </MTEntries>
-<MTElse>
-    <MTEntries limit="auto">
-<$MTEntryTrackbackData$>
-<$MTInclude module="<__trans phrase="Entry Summary">"$>
-    </MTEntries>
-</MTIf>
+</MTEntries>
 
 <div class="content-nav">
Index: branches/release-30/default_templates/tags.mtml
===================================================================
--- branches/release-30/default_templates/tags.mtml (revision 1287)
+++ branches/release-30/default_templates/tags.mtml (revision 1423)
@@ -3,5 +3,4 @@
     <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>
Index: branches/release-30/default_templates/popup_image.mtml
===================================================================
--- branches/release-30/default_templates/popup_image.mtml (revision 1098)
+++ branches/release-30/default_templates/popup_image.mtml (revision 1423)
@@ -1,11 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!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><$MTImageURL$></title></head>
 <body id="uploaded-image-popup" class="popup" style="margin: 0;padding: 0;">
-<div id="popup-container">
-    <div id="popup-container">
-        <img src="<$MTImageURL$>" width="<$MTImageWidth$>" height="<$MTImageHeight$>" style="margin: 0;padding: 0;border: 0;" />
-    </div>
-</div>
+    <img src="<$MTImageURL$>" width="<$MTImageWidth$>" height="<$MTImageHeight$>" alt="<$MTImageURL$>" style="margin: 0;padding: 0;border: 0;" />
 </body>
 </html>
Index: branches/release-30/default_templates/styles.mtml
===================================================================
--- branches/release-30/default_templates/styles.mtml (revision 1101)
+++ branches/release-30/default_templates/styles.mtml (revision 1423)
@@ -1,3 +1,2 @@
-/* Default Layout: <MTSetVar name="page_layout" value="layout-wtt"> */
 @import url(<$MTStaticWebPath$>themes-base/blog.css);
 @import url(<$MTStaticWebPath$>themes/minimalist-red/screen.css);
Index: branches/release-30/default_templates/header.mtml
===================================================================
--- branches/release-30/default_templates/header.mtml (revision 1192)
+++ branches/release-30/default_templates/header.mtml (revision 1423)
@@ -1,23 +1,16 @@
-<mt:setvarblock name="html_head" prepend="1">
-    <MTIf name="main_template">
-<link rel="alternate" type="application/atom+xml" title="Atom" href="<$MTLink template="atom"$>" />
-<link rel="alternate" type="application/rss+xml" title="RSS" href="<$MTLink template="rss"$>" />
-        <MTUnless name="main_index">
-<link rel="start" href="<$MTBlogURL$>" title="Home" />
-        </MTUnless>
-<$MTCCLicenseRDF$>
-    </MTIf>
-</mt:setvarblock>
 <!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$>" />
-    <title><$mt:var name="title"$></title>
     <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"><$MTGetVar name="body_class"$> </MTIf><$MTGetVar name="page_layout" default="layout-wtt"$>"<MTIf name="body_onload"> onload="<$MTGetVar name="body_onload"$>"</MTIf>>
+<body class="<MTIf name="body_class"><$MTGetVar name="body_class"$> </MTIf><$MTGetVar name="page_layout"$>"<MTIf name="body_onload"> onload="<$MTGetVar name="body_onload"$>"</MTIf>>
     <div id="container">
         <div id="container-inner">
Index: branches/release-30/default_templates/comment_preview.mtml
===================================================================
--- branches/release-30/default_templates/comment_preview.mtml (revision 1139)
+++ branches/release-30/default_templates/comment_preview.mtml (revision 1423)
@@ -2,7 +2,6 @@
 <MTSetVar name="body_onload" value="individualArchivesOnLoad(commenter_name)">
 <MTSetVar name="system_template" value="1">
-<MTSetVar name="comment_preview_template" value="1">
 <MTSetVar name="feedback_template" value="1">
-<MTSetVarBlock name="page_title"><__trans phrase="Comment on [_1]" params="<$MTEntryTitle$>"></MTSetVarBlock>
+<MTSetVarBlock name="page_title"><__trans phrase="Previewing your Comment"></MTSetVarBlock>
 <MTSetVarBlock name="title"><$MTBlogName encode_html="1"$>: <$MTGetVar name="page_title"$></MTSetVarBlock>
 <MTSetVarBlock name="html_head">
@@ -12,5 +11,5 @@
 <$MTInclude module="<__trans phrase="Header">"$>
 
-<h1 id="page-title"><__trans phrase="Previewing your Comment"></h1>
+<h1 id="page-title"><$MTGetVar name="page_title"$></h1>
 
 <$MTInclude module="<__trans phrase="Comment Detail">"$>
Index: branches/release-30/default_templates/rss.mtml
===================================================================
--- branches/release-30/default_templates/rss.mtml (revision 1098)
+++  (revision )
@@ -1,28 +1,0 @@
-<$MTHTTPContentType type="application/rss+xml"$><?xml version="1.0" encoding="<$MTPublishCharset$>"?>
-<rss version="2.0">
-    <channel>
-        <title><$MTBlogName remove_html="1" encode_xml="1"$></title>
-        <link><$MTBlogURL$></link>
-        <description><$MTBlogDescription remove_html="1" encode_xml="1"$></description>
-        <language><$MTBlogLanguage ietf="1"$></language>
-        <copyright><__trans phrase="Copyright [_1]" params="<$MTDate format="%Y"$>"></copyright>
-        <lastBuildDate><MTEntries lastn="1"><$MTEntryDate format_name="rfc822"$></MTEntries></lastBuildDate>
-        <generator>http://www.sixapart.com/movabletype/</generator>
-        <docs>http://www.rssboard.org/rss-specification</docs>
-        <MTEntries lastn="15">
-        <item>
-            <title><$MTEntryTitle remove_html="1" encode_xml="1"$></title>
-            <description><$MTEntryBody encode_xml="1"$></description>
-            <link><$MTEntryPermalink encode_xml="1"$></link>
-            <guid><$MTEntryPermalink encode_xml="1"$></guid>
-            <MTEntryCategories>
-                <category domain="http://www.sixapart.com/ns/types#category"><$MTCategoryLabel remove_html="1" encode_xml="1"$></category>
-            </MTEntryCategories>
-            <MTEntryIfTagged><MTEntryTags>
-                <category domain="http://www.sixapart.com/ns/types#tag"><$MTTagName remove_html="1" encode_xml="1"$></category>
-            </MTEntryTags></MTEntryIfTagged>
-            <pubDate><$MTEntryDate format_name="rfc822"$></pubDate>
-        </item>
-        </MTEntries>
-    </channel>
-</rss>