Index: branches/release-30/plugins/WidgetManager/default_widgets/main_index_widgets_group.mtml
===================================================================
--- branches/release-30/plugins/WidgetManager/default_widgets/main_index_widgets_group.mtml (revision 1430)
+++ branches/release-30/plugins/WidgetManager/default_widgets/main_index_widgets_group.mtml (revision 1430)
@@ -0,0 +1,9 @@
+<mt:Ignore>
+    <__trans phrase='This is a custom set of widgets that are conditioned to only appear on the homepage (or "main_index"). More info: [_1]' params='http://www.movabletype.org/documentation/designer/widget-sets.html'>
+</mt:Ignore>
+<mt:If name="main_index">
+    <$mt:include widget="<__trans phrase="Recent Comments">"$>
+    <$mt:include widget="<__trans phrase="Recent Entries">"$>
+    <$mt:include widget="<__trans phrase="Recent Assets">"$>
+    <$mt:include widget="<__trans phrase="Tag Cloud">"$>
+</mt:If>
Index: branches/release-30/plugins/WidgetManager/default_widgets/archive_widgets_group.mtml
===================================================================
--- branches/release-30/plugins/WidgetManager/default_widgets/archive_widgets_group.mtml (revision 1430)
+++ branches/release-30/plugins/WidgetManager/default_widgets/archive_widgets_group.mtml (revision 1430)
@@ -0,0 +1,14 @@
+<mt:Ignore>
+    <__trans phrase="This is a custom set of widgets that are conditioned to serve different content based upon what type of archive it is included. More info: [_1]" params="http://www.movabletype.org/documentation/designer/widget-sets.html">
+</mt:Ignore>
+<mt:if name="category_archive">
+    <mt:IfArchiveTypeEnabled archive_type="Category-Monthly">
+        <$mt:include widget="<__trans phrase="Current Category Monthly Archives">"$>
+    </mt:IfArchiveTypeEnabled>
+</mt:if>
+<mt:IfArchiveTypeEnabled archive_type="Category">
+    <$mt:include widget="<__trans phrase="Category Archives">"$>
+</mt:IfArchiveTypeEnabled>
+<mt:IfArchiveTypeEnabled archive_type="Monthly">
+    <$mt:include widget="<__trans phrase="Monthly Archives">"$>
+</mt:IfArchiveTypeEnabled>
Index: branches/release-30/plugins/WidgetManager/default_widgets/widgets.cfg
===================================================================
--- branches/release-30/plugins/WidgetManager/default_widgets/widgets.cfg (revision 1227)
+++ branches/release-30/plugins/WidgetManager/default_widgets/widgets.cfg (revision 1430)
@@ -5,6 +5,6 @@
     },
     {
-        template => 'archive_meta_widget.mtml',
-        label => 'Archives',
+        template => 'archive_widgets_group.mtml',
+        label => 'Archive Widgets Group',
     },
     {
@@ -33,6 +33,6 @@
     },
     {
-        template => 'main_index_meta_widget.mtml',
-        label => 'Home Page Widgets',
+        template => 'main_index_widgets_group.mtml',
+        label => 'Home Page Widgets Group',
     },
     {
Index: branches/release-30/plugins/WidgetManager/default_widgets/main_index_meta_widget.mtml
===================================================================
--- branches/release-30/plugins/WidgetManager/default_widgets/main_index_meta_widget.mtml (revision 1229)
+++  (revision )
@@ -1,9 +1,0 @@
-<mt:Ignore>
-    <__trans phrase='This is a custom set of widgets that are conditioned to only appear on the homepage (or "main_index"). More info: [_1]' params='http://www.movabletype.org/documentation/designer/widget-sets.html'>
-</mt:Ignore>
-<mt:If name="main_index">
-    <$mt:include widget="<__trans phrase="Recent Comments">"$>
-    <$mt:include widget="<__trans phrase="Recent Entries">"$>
-    <$mt:include widget="<__trans phrase="Recent Assets">"$>
-    <$mt:include widget="<__trans phrase="Tag Cloud">"$>
-</mt:If>
Index: branches/release-30/plugins/WidgetManager/default_widgets/archive_meta_widget.mtml
===================================================================
--- branches/release-30/plugins/WidgetManager/default_widgets/archive_meta_widget.mtml (revision 1229)
+++  (revision )
@@ -1,14 +1,0 @@
-<mt:Ignore>
-    <__trans phrase="This is a custom set of widgets that are conditioned to serve different content based upon what type of archive it is included. More info: [_1]" params="http://www.movabletype.org/documentation/designer/widget-sets.html">
-</mt:Ignore>
-<mt:if name="category_archive">
-    <mt:IfArchiveTypeEnabled archive_type="Category-Monthly">
-        <$mt:include widget="<__trans phrase="Current Category Monthly Archives">"$>
-    </mt:IfArchiveTypeEnabled>
-</mt:if>
-<mt:IfArchiveTypeEnabled archive_type="Category">
-    <$mt:include widget="<__trans phrase="Category Archives">"$>
-</mt:IfArchiveTypeEnabled>
-<mt:IfArchiveTypeEnabled archive_type="Monthly">
-    <$mt:include widget="<__trans phrase="Monthly Archives">"$>
-</mt:IfArchiveTypeEnabled>