Index: /branches/release-41/default_templates/entry_summary.mtml
===================================================================
--- /branches/release-41/default_templates/entry_summary.mtml (revision 2604)
+++ /branches/release-41/default_templates/entry_summary.mtml (revision 2733)
@@ -26,7 +26,7 @@
     <mt:EntryIfTagged>
         <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"><mt:EntryTags glue='<span class="delimiter">,</span></li> <li class="entry-tag">'><a href="javascript:void(0)" onclick="location.href='<$mt:TagSearchLink encode_js="1"$>';return false;" rel="tag"><$mt:TagName$></a></mt:EntryTags></li>
+            <h4><__trans phrase="Tags"><span class="delimiter">:</span></h4>
+            <ul>
+                <li><mt:EntryTags glue='<span class="delimiter">,</span></li> <li>'><a href="javascript:void(0)" onclick="location.href='<$mt:TagSearchLink encode_js="1"$>';return false;" rel="tag"><$mt:TagName$></a></mt:EntryTags></li>
             </ul>
         </div>
Index: /branches/release-41/default_templates/entry.mtml
===================================================================
--- /branches/release-41/default_templates/entry.mtml (revision 2619)
+++ /branches/release-41/default_templates/entry.mtml (revision 2733)
@@ -60,7 +60,7 @@
     <mt:If tag="EntryCategories">
                                     <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"><mt:EntryCategories glue='<span class="delimiter">,</span></li> <li class="entry-category">'><a href="<$mt:CategoryArchiveLink$>" rel="tag"><$mt:CategoryLabel$></a></mt:EntryCategories></li>
+                                        <h4><__trans phrase="Categories"><span class="delimiter">:</span></h4>
+                                        <ul>
+                                            <li><mt:EntryCategories glue='<span class="delimiter">,</span></li> <li class="entry-category">'><a href="<$mt:CategoryArchiveLink$>" rel="tag"><$mt:CategoryLabel$></a></mt:EntryCategories></li>
                                         </ul>
                                     </div>
@@ -69,7 +69,7 @@
 <mt:EntryIfTagged>
                                     <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"><mt:EntryTags glue='<span class="delimiter">,</span></li> <li class="entry-tag">'><a href="javascript:void(0)" onclick="location.href='<$mt:TagSearchLink encode_js="1"$>';return false;" rel="tag"><$mt:TagName$></a></mt:EntryTags></li>
+                                        <h4><__trans phrase="Tags"><span class="delimiter">:</span></h4>
+                                        <ul>
+                                            <li><mt:EntryTags glue='<span class="delimiter">,</span></li> <li>'><a href="javascript:void(0)" onclick="location.href='<$mt:TagSearchLink encode_js="1"$>';return false;" rel="tag"><$mt:TagName$></a></mt:EntryTags></li>
                                         </ul>
                                     </div>
Index: /branches/release-41/mt-static/themes-base/blog.css
===================================================================
--- /branches/release-41/mt-static/themes-base/blog.css (revision 2724)
+++ /branches/release-41/mt-static/themes-base/blog.css (revision 2733)
@@ -349,6 +349,6 @@
 }
 
-.entry-tags-header,
-.entry-categories-header {
+.entry-tags h4,
+.entry-categories h4 {
     margin-bottom: 0;
     margin-right: .25em;
@@ -357,6 +357,6 @@
 }
 
-.entry-tags-list,
-.entry-categories-list {
+.entry-tags ul,
+.entry-categories ul {
     display: inline;
     list-style: none;
@@ -364,6 +364,6 @@
     padding-left: 0;
 }
-.entry-tags-list .entry-tag,
-.entry-categories-list .entry-category {
+.entry-tags ul li,
+.entry-categories ul li {
     display: inline;
 }
@@ -459,8 +459,6 @@
 }
 
-.widget-list,  /*legacy selector*/
-.archive-list,  /*legacy selector*/
 .archive-content ul,
-.widget .widget-content ul {
+.widget-content ul {
     margin: 0;
     padding: 0;
@@ -468,23 +466,19 @@
 }
 
-.widget .widget-content ul ul,
-.widget .widget-list .widget-list {  /*legacy selector*/
+.widget-content ul ul {
     margin-left: 15px;
 }
 
-.widget-content li,
-.widget-list-item {  /*legacy selector*/
+.widget-content li {
     margin-top: 5px;
     margin-bottom: 5px;
 }
 
-.widget-tag-cloud .widget-content ul,
-.widget-tag-cloud .widget-list {  /*legacy selector*/
+.widget-tag-cloud .widget-content ul {
     margin-right: 0;
     margin-left: 0;
 }
 
-.widget-tag-cloud .widget-content li,
-.widget-tag-cloud .widget-list-item {  /*legacy selector*/
+.widget-tag-cloud .widget-content li {
     display: inline;
     margin: 0 5px 0 0;
@@ -510,6 +504,5 @@
 }
 
-.widget-recent-assets .widget-content ul,
-.widget-recent-assets .widget-content .widget-list {  /*legacy selector*/
+.widget-recent-assets .widget-content ul {
     overflow: auto;
     margin-right: 0;