diff --git a/ChangeLog b/ChangeLog
index 0db78afebdc9937d1f94284e2dc5c81c80e8b426..c6da3dbaca5996b1a64c5bff695acba8ca228c76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-08-16  Akkana Peck  <akkana@cvs.gnome.org>
+	* menus/image-menu.xml.in
+	* app/actions/image-actions.c
+	* app/actions/plug-in-actions.c
+	* plug-ins/common/compose.c
+	* plug-ins/common/decompose.c
+	* plug-ins/common/vinvert.c:
+	Remove erroneous extra *compose entries, and move *compose into
+	a Components submenu (re IRC discussion); move Value Invert to
+	near Invert (suggested by mitch)
+
 2005-08-16  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimpcontainerview.[ch]: added utility function
diff --git a/app/actions/plug-in-actions.c b/app/actions/plug-in-actions.c
index 3af41c114a8a7abbcaa07f119e376c1c5960868a..a25d44349d243c860279b0930e16fe91d45bce6a 100644
--- a/app/actions/plug-in-actions.c
+++ b/app/actions/plug-in-actions.c
@@ -63,6 +63,7 @@ static GimpActionEntry plug_in_actions[] =
   { "plug-in-blur-menu",           NULL, N_("_Blur")          },
   { "plug-in-colors-menu",         NULL, N_("_Colors")        },
   { "plug-in-colors-map-menu",     NULL, N_("Ma_p")           },
+  { "plug-in-colors-components-menu",     NULL, N_("_Components")           },
   { "plug-in-noise-menu",          NULL, N_("_Noise")         },
   { "plug-in-edge-detect-menu",    NULL, N_("Edge-De_tect")   },
   { "plug-in-enhance-menu",        NULL, N_("En_hance")       },
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index d0d56f97c61dba14bbf94fe233e81326750559ba..0aae841a8202b25764bd1fdeda9b64fa31c5ad48 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -439,7 +439,9 @@
       <menuitem action="tools-posterize" />
       <separator />
       <menuitem action="drawable-desaturate" />
-      <menuitem action="drawable-invert" />
+      <placeholder name="Invert">
+        <menuitem action="drawable-invert" />
+      </placeholder>
       <menu action="layers-colors-auto-menu" name="Auto">
         <menuitem action="drawable-equalize" />
         <menuitem action="drawable-levels-stretch" />
@@ -450,6 +452,8 @@
       </placeholder>
       <separator />
       <menu action="plug-in-colors-map-menu" name="Map" />
+      <menu action="plug-in-colors-components-menu" name="Components" />
+      <separator />
       <placeholder action="plug-in-colors-menu" name="Color Plug-Ins" />
     </menu>
 
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index 406a897ec1e1c2a686fb2af0ce2be9c0098c5d4c..7df52a3f0305d309ff45006710c5e6840698a199 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -323,8 +323,7 @@ query (void)
                           G_N_ELEMENTS (return_vals),
 			  args, return_vals);
 
-  gimp_plugin_menu_register (COMPOSE_PROC, "<Image>/Colors");
-  gimp_plugin_menu_register (COMPOSE_PROC, "<Image>/Colors/Image Mode");
+  gimp_plugin_menu_register (COMPOSE_PROC, "<Image>/Colors/Components");
 
   gimp_install_procedure (DRAWABLE_COMPOSE_PROC,
 			  "Compose an image from multiple drawables of gray images",
@@ -355,8 +354,7 @@ query (void)
 			  G_N_ELEMENTS (recompose_args), 0,
 			  recompose_args, NULL);
 
-  gimp_plugin_menu_register (RECOMPOSE_PROC, "<Image>/Colors");
-  gimp_plugin_menu_register (RECOMPOSE_PROC, "<Image>/Colors/Image Mode");
+  gimp_plugin_menu_register (RECOMPOSE_PROC, "<Image>/Colors/Components");
 }
 
 
diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c
index 3096c365eb4442f0566717cb0cde979488c88496..b1a6c7a44c202f657c85af5061f7cf9688b7306b 100644
--- a/plug-ins/common/decompose.c
+++ b/plug-ins/common/decompose.c
@@ -253,8 +253,7 @@ query (void)
                           G_N_ELEMENTS (return_vals),
 			  args, return_vals);
 
-  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
-  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Image Mode");
+  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Components");
 }
 
 static void
diff --git a/plug-ins/common/vinvert.c b/plug-ins/common/vinvert.c
index 48f3eec755e801f51e7bc081f88fdaa676fc4493..0ea4d0fbfc063aaa933e1d9246c1e9fd22caeda7 100644
--- a/plug-ins/common/vinvert.c
+++ b/plug-ins/common/vinvert.c
@@ -87,7 +87,7 @@ query (void)
 			  G_N_ELEMENTS (args), 0,
 			  args, NULL);
 
-  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
+  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Invert");
 }
 
 static void