Index: branches/release-33/lib/MT/DefaultTemplates.pm
===================================================================
--- branches/release-33/lib/MT/DefaultTemplates.pm (revision 1463)
+++ branches/release-33/lib/MT/DefaultTemplates.pm (revision 1709)
@@ -47,4 +47,10 @@
                 label => 'JavaScript',
                 outfile => 'mt.js',
+                rebuild_me => 1,
+            },
+            'feed_recent' => {
+                label => 'Feed - Recent Entries',
+                outfile => 'atom.xml',
+                rebuild_me => 1,
             },
             'rsd' => {
@@ -53,9 +59,4 @@
                 rebuild_me => 1,
             },
-            'feed_recent' => {
-                label => 'Feed - Recent Entries',
-                outfile => 'atom.xml',
-                rebuild_me => 1,
-            },
         },
         'individual' => {
@@ -80,13 +81,15 @@
         },
         'archive' => {
-            'entry_listing' => {
-                label => 'Entry Listing',
+            'monthly_entry_listing' => {
+                label => 'Monthly Entry Listing',
                 mappings => {
                     monthly => {
                         archive_type => 'Monthly',
                     },
-                    category_monthly => {
-                        archive_type => 'Category-Monthly',
-                    },
+                },
+            },
+            'category_entry_listing' => {
+                label => 'Category Entry Listing',
+                mappings => {
                     category => {
                         archive_type => 'Category',
@@ -118,48 +121,24 @@
         },
         'module' => {
-            'categories' => {
-                label => 'Categories',
-            },
-            'comment_detail' => {
-                label => 'Comment Detail',
-            },
-            'comment_form' => {
-                label => 'Comment Form',
+            'banner_header' => {
+                label => 'Banner Header',
+            },
+            'banner_footer' => {
+                label => 'Banner Footer',
+            },
+            'entry_summary' => {
+                label => 'Entry Summary',
+            },
+            'html_head' => {
+                label => 'HTML Head',
+            },
+            'sidebar' => {
+                label => 'Sidebar',
             },
             'comments' => {
                 label => 'Comments',
             },
-            'entry_detail' => {
-                label => 'Entry Detail',
-            },
-            'entry_summary' => {
-                label => 'Entry Summary',
-            },
-            'entry_metadata' => {
-                label => 'Entry Metadata',
-            },
-            'tags' => {
-                label => 'Tags',
-            },
-            'footer' => {
-                label => 'Footer',
-            },
-            'header' => {
-                label => 'Header',
-            },
-            'sidebar_2col' => {
-                label => 'Sidebar - 2 Column Layout',
-            },
-            'sidebar_3col' => {
-                label => 'Sidebar - 3 Column Layout',
-            },
-            'sidebar' => {
-                label => 'Sidebar',
-            },
             'trackbacks' => {
-                label => 'TrackBacks',
-            },
-            'page_detail' => {
-                label => 'Page Detail',
+                label => 'Trackbacks',
             },
         },