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>