Index: /branches/release-41/default_templates/category_archive_list.mtml
===================================================================
--- /branches/release-41/default_templates/category_archive_list.mtml (revision 2604)
+++ /branches/release-41/default_templates/category_archive_list.mtml (revision 2648)
@@ -5,10 +5,10 @@
     <mt:TopLevelCategories>
         <mt:SubCatIsFirst>
-        <ul class="widget-list">
+        <ul>
         </mt:SubCatIsFirst>
         <mt:If tag="CategoryCount">
-            <li class="widget-list-item"><a href="<$mt:CategoryArchiveLink$>"<mt:If tag="CategoryDescription"> title="<$mt:CategoryDescription$>"</mt:If>><__trans phrase="[_1] ([_2])" params="<$mt:CategoryLabel$>%%<$mt:CategoryCount$>"></a>
+            <li><a href="<$mt:CategoryArchiveLink$>"<mt:If tag="CategoryDescription"> title="<$mt:CategoryDescription$>"</mt:If>><__trans phrase="[_1] ([_2])" params="<$mt:CategoryLabel$>%%<$mt:CategoryCount$>"></a>
         <mt:Else>
-            <li class="widget-list-item"><$mt:CategoryLabel$>
+            <li><$mt:CategoryLabel$>
         </mt:If>
         <$mt:SubCatsRecurse$>
Index: /branches/release-41/default_templates/current_author_monthly_archive_list.mtml
===================================================================
--- /branches/release-41/default_templates/current_author_monthly_archive_list.mtml (revision 2052)
+++ /branches/release-41/default_templates/current_author_monthly_archive_list.mtml (revision 2648)
@@ -5,7 +5,7 @@
     <h3 class="widget-header"><__trans phrase="[_1]: Monthly Archives" params="<$mt:AuthorDisplayName$>"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$mt:ArchiveTitle$>%%<$mt:ArchiveCount$>"></a></li>
+            <li><a href="<$mt:ArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$mt:ArchiveTitle$>%%<$mt:ArchiveCount$>"></a></li>
         <mt:ArchiveListFooter>
         </ul>
Index: /branches/release-41/default_templates/recent_comments.mtml
===================================================================
--- /branches/release-41/default_templates/recent_comments.mtml (revision 2604)
+++ /branches/release-41/default_templates/recent_comments.mtml (revision 2648)
@@ -5,7 +5,7 @@
     <h3 class="widget-header"><__trans phrase="Recent Comments"></h3>
     <div class="widget-content">
-        <ul class="recent-comments-list">
+        <ul>
         </mt:CommentsHeader>
-            <li><__trans phrase="<a href="[_1]">[_2] commented on [_3]</a>: [_4]" params="<$mt:CommentLink$>%%<$mt:CommentAuthor$>%%<mt:CommentEntry><$mt:EntryTitle$></mt:CommentEntry>%%<$mt:CommentBody remove_html="1" trim_to="10"$>"></li>
+            <li><__trans phrase="<strong>[_1]:</strong> [_2] <a href="[_3]" title="full comment on: [_4]">read more</a>" params="<$mt:CommentAuthor$>%%<$mt:CommentBody remove_html="1" words="10"$>%%<$mt:CommentLink$>%%<mt:CommentEntry><$mt:EntryTitle$></mt:CommentEntry>"></li>
         <mt:CommentsFooter>
         </ul>
Index: /branches/release-41/default_templates/current_category_monthly_archive_list.mtml
===================================================================
--- /branches/release-41/default_templates/current_category_monthly_archive_list.mtml (revision 2052)
+++ /branches/release-41/default_templates/current_category_monthly_archive_list.mtml (revision 2648)
@@ -5,7 +5,7 @@
     <h3 class="widget-header"><__trans phrase="[_1]: Monthly Archives" params="<$mt:CategoryLabel$>"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><__trans phrase="[_1]" params="<$mt:ArchiveTitle$>"></a></li>
+            <li><a href="<$mt:ArchiveLink$>"><__trans phrase="[_1]" params="<$mt:ArchiveTitle$>"></a></li>
         <mt:ArchiveListFooter>
         </ul>
Index: /branches/release-41/default_templates/monthly_archive_list.mtml
===================================================================
--- /branches/release-41/default_templates/monthly_archive_list.mtml (revision 2052)
+++ /branches/release-41/default_templates/monthly_archive_list.mtml (revision 2648)
@@ -5,7 +5,7 @@
     <h3 class="widget-header"><__trans phrase="[_1] <a href="[_2]">Archives</a>" params="<$mt:ArchiveTypeLabel$>%%<$mt:Link template="archive_index"$>"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$mt:ArchiveTitle$>%%<$mt:ArchiveCount$>"></a></li>
+            <li><a href="<$mt:ArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$mt:ArchiveTitle$>%%<$mt:ArchiveCount$>"></a></li>
         <mt:ArchiveListFooter>
         </ul>
Index: /branches/release-41/default_templates/pages_list.mtml
===================================================================
--- /branches/release-41/default_templates/pages_list.mtml (revision 2052)
+++ /branches/release-41/default_templates/pages_list.mtml (revision 2648)
@@ -3,23 +3,15 @@
     <h3 class="widget-header"><__trans phrase="Pages"></h3>
     <div class="widget-content">
+        <ul>
     <mt:Pages no_folder="1" sort_by="title" sort_order="ascend">
-        <mt:PagesHeader>
-        <ul class="widget-list">
-        </mt:PagesHeader>
-            <li class="widget-list-item"><a href="<$mt:PagePermalink$>" title="<$mt:PageTitle$>"><$mt:PageTitle$></a></li>
-        <mt:PagesFooter>
-        </ul>
-        </mt:PagesFooter>
+            <li class="page page-<$mt:PageID$>"><a href="<$mt:PagePermalink$>"><$mt:PageTitle$></a></li>
     </mt:Pages>
     <mt:TopLevelFolders>
-        <mt:FolderHeader>
-        <ul class="widget-list">
-        </mt:FolderHeader>
-            <li class="widget-list-item"><b><$mt:FolderLabel$></b>
+            <li class="folder folder-<$mt:FolderID$>"><strong><a href="<$mt:BlogURL$><$mt:FolderPath$>/"><$mt:FolderLabel$></a></strong>
         <mt:Pages sort_by="title" sort_order="ascend">
             <mt:PagesHeader>
-                <ul class="widget-list">
+                <ul>
             </mt:PagesHeader>
-                    <li class="widget-list-item"><a href="<$mt:PagePermalink$>" title="<$mt:PageTitle$>"><$mt:PageTitle$></a></li>
+                    <li class="page page-<$mt:PageID$>"><a href="<$mt:PagePermalink$>"><$mt:PageTitle$></a></li>
             <mt:PagesFooter>
                 </ul>
@@ -28,9 +20,7 @@
         <$mt:SubFolderRecurse$>
             </li>
-        <mt:FolderFooter>
+    </mt:TopLevelFolders>
         </ul>
-        </mt:FolderFooter>
-    </mt:TopLevelFolders>
-   </div>
+    </div>
 </div>
 </mt:IfArchiveTypeEnabled>
Index: /branches/release-41/default_templates/recent_entries.mtml
===================================================================
--- /branches/release-41/default_templates/recent_entries.mtml (revision 2604)
+++ /branches/release-41/default_templates/recent_entries.mtml (revision 2648)
@@ -5,7 +5,7 @@
     <h3 class="widget-header"><__trans phrase="Recent Entries"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
         </mt:EntriesHeader>
-            <li class="widget-list-item"><a href="<$mt:EntryPermalink$>"><$mt:EntryTitle$></a></li>
+            <li><a href="<$mt:EntryPermalink$>"><$mt:EntryTitle$></a></li>
         <mt:EntriesFooter>
         </ul>
Index: /branches/release-41/default_templates/date_based_author_archives.mtml
===================================================================
--- /branches/release-41/default_templates/date_based_author_archives.mtml (revision 2052)
+++ /branches/release-41/default_templates/date_based_author_archives.mtml (revision 2648)
@@ -5,9 +5,9 @@
     <h3 class="widget-header"><__trans phrase="Author Yearly Archives"></h3>
     <div class="widget-content">
-                <ul class="widget-list">
+        <ul>
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
+            <li><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
         <mt:ArchiveListFooter>
-                </ul>
+        </ul>
     </div>
 </div>
@@ -22,9 +22,9 @@
     <h3 class="widget-header"><__trans phrase="Author Monthly Archives"></h3>
     <div class="widget-content">
-                <ul class="widget-list">
+        <ul>
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
+            <li><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
         <mt:ArchiveListFooter>
-                </ul>
+        </ul>
     </div>
 </div>
@@ -34,12 +34,12 @@
 
 <mt:IfArchiveTypeEnabled archive_type="Author-Weekly">
+    <mt:ArchiveList archive_type="Author-Weekly">
+        <mt:ArchiveListHeader>
 <div class="widget-archive-author-weekly widget-archive widget">
     <h3 class="widget-header"><__trans phrase="Author Weekly Archives"></h3>
     <div class="widget-content">
-    <mt:ArchiveList archive_type="Author-Weekly">
-        <mt:ArchiveListHeader>
-        <ul class="widget-list">
+        <ul>
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
+            <li><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
         <mt:ArchiveListFooter>
         </ul>
@@ -56,7 +56,7 @@
     <h3 class="widget-header"><__trans phrase="Author Daily Archives"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
+            <li><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
         <mt:ArchiveListFooter>
         </ul>
Index: /branches/release-41/default_templates/date_based_category_archives.mtml
===================================================================
--- /branches/release-41/default_templates/date_based_category_archives.mtml (revision 2052)
+++ /branches/release-41/default_templates/date_based_category_archives.mtml (revision 2648)
@@ -5,7 +5,7 @@
     <h3 class="widget-header"><__trans phrase="Category Yearly Archives"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
+            <li><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
         <mt:ArchiveListFooter>
         </ul>
@@ -22,7 +22,7 @@
     <h3 class="widget-header"><__trans phrase="Category Monthly Archives"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
+            <li><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
         <mt:ArchiveListFooter>
         </ul>
@@ -39,7 +39,7 @@
     <h3 class="widget-header"><__trans phrase="Category Weekly Archives"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
+            <li><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
         <mt:ArchiveListFooter>
         </ul>
@@ -56,7 +56,7 @@
     <h3 class="widget-header"><__trans phrase="Category Daily Archives"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
+            <li><a href="<$mt:ArchiveLink$>"><$mt:ArchiveTitle$> (<$mt:ArchiveCount$>)</a></li>
         <mt:ArchiveListFooter>
         </ul>
Index: /branches/release-41/default_templates/author_archive_list.mtml
===================================================================
--- /branches/release-41/default_templates/author_archive_list.mtml (revision 2052)
+++ /branches/release-41/default_templates/author_archive_list.mtml (revision 2648)
@@ -5,7 +5,7 @@
     <h3 class="widget-header"><__trans phrase="Authors"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$mt:ArchiveTitle$>%%<$mt:ArchiveCount$>"></a></li>
+            <li><a href="<$mt:ArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$mt:ArchiveTitle$>%%<$mt:ArchiveCount$>"></a></li>
         <mt:ArchiveListFooter>
         </ul>
Index: /branches/release-41/default_templates/tag_cloud.mtml
===================================================================
--- /branches/release-41/default_templates/tag_cloud.mtml (revision 2603)
+++ /branches/release-41/default_templates/tag_cloud.mtml (revision 2648)
@@ -1,10 +1,12 @@
+<mt:If tag="Tags">
 <div class="widget-tag-cloud widget">
     <h3 class="widget-header"><__trans phrase="Tag Cloud"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
     <mt:Tags top="20">
-            <li class="rank-<$mt:TagRank max="10"$> widget-list-item"><a href="javascript:void(0)" onclick="location.href='<$mt:TagSearchLink encode_js="1"$>';return false;" rel="tag"><$mt:TagName$></a></li>
+            <li class="rank-<$mt:TagRank max="10"$>"><a href="javascript:void(0)" onclick="location.href='<$mt:TagSearchLink encode_js="1"$>';return false;" rel="tag"><$mt:TagName$></a></li>
     </mt:Tags>
         </ul>
     </div>
 </div>
+</mt:If>
Index: /branches/release-41/default_templates/recent_assets.mtml
===================================================================
--- /branches/release-41/default_templates/recent_assets.mtml (revision 2604)
+++ /branches/release-41/default_templates/recent_assets.mtml (revision 2648)
@@ -5,5 +5,5 @@
     <h3 class="widget-header"><__trans phrase="Recent Assets"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
         </mt:AssetsHeader>
         <li class="item"><a class="asset-image" href="<$mt:AssetURL$>"><img src="<$mt:AssetThumbnailURL height="70"$>" class="asset-img-thumb" alt="<$mt:AssetLabel$>" title="<$mt:AssetLabel$>" /></a></li>
Index: /branches/release-41/default_templates/search.mtml
===================================================================
--- /branches/release-41/default_templates/search.mtml (revision 2603)
+++ /branches/release-41/default_templates/search.mtml (revision 2648)
@@ -26,7 +26,7 @@
     <h3 class="widget-header"><__trans phrase="Tags"></h3>
     <div class="widget-content">
-        <ul class="widget-list">
+        <ul>
         <mt:Tags>
-            <li class="widget-list-item"><a href="javascript:void(0)" onclick="location.href='<$mt:TagSearchLink encode_js="1"$>';return false;"><__trans phrase="[_1] ([_2])" params="<$mt:TagName$>%%<$mt:TagCount$>"></a></li>
+            <li><a href="javascript:void(0)" onclick="location.href='<$mt:TagSearchLink encode_js="1"$>';return false;"><__trans phrase="[_1] ([_2])" params="<$mt:TagName$>%%<$mt:TagCount$>"></a></li>
         </mt:Tags>
         </ul>
Index: /branches/release-41/mt-static/themes-base/blog.css
===================================================================
--- /branches/release-41/mt-static/themes-base/blog.css (revision 2631)
+++ /branches/release-41/mt-static/themes-base/blog.css (revision 2648)
@@ -459,5 +459,6 @@
 }
 
-.widget-list,
+.widget .widget-content ul,
+.widget-list,  /*legacy selector*/
 .archive-list {
     margin: 0;
@@ -466,19 +467,23 @@
 }
 
-.widget-list .widget-list {
+.widget .widget-content ul ul,
+.widget .widget-list .widget-list {  /*legacy selector*/
     margin-left: 15px;
 }
 
-.widget-list-item {
+.widget-content li,
+.widget-list-item {  /*legacy selector*/
     margin-top: 5px;
     margin-bottom: 5px;
 }
 
-.widget-tag-cloud .widget-list {
+.widget-tag-cloud .widget-content ul,
+.widget-tag-cloud .widget-list {  /*legacy selector*/
     margin-right: 0;
     margin-left: 0;
 }
 
-.widget-tag-cloud .widget-list-item {
+.widget-tag-cloud .widget-content li,
+.widget-tag-cloud .widget-list-item {  /*legacy selector*/
     display: inline;
     margin: 0 5px 0 0;
@@ -504,5 +509,6 @@
 }
 
-.widget-recent-assets .widget-content .widget-list {
+.widget-recent-assets .widget-content ul,
+.widget-recent-assets .widget-content .widget-list {  /*legacy selector*/
     overflow: auto;
     margin-right: 0;