Index: menus/image-menu.xml.in
===================================================================
RCS file: /cvs/gnome/gimp/menus/image-menu.xml.in,v
retrieving revision 1.49
diff -u -p -p -0 -r1.49 image-menu.xml.in
--- menus/image-menu.xml.in	29 Jul 2005 20:26:29 -0000	1.49
+++ menus/image-menu.xml.in	1 Aug 2005 04:54:04 -0000
@@ -271,6 +270,0 @@
-      <menu action="image-mode-menu" name="Mode">
-        <menuitem action="image-convert-rgb" />
-        <menuitem action="image-convert-grayscale" />
-        <menuitem action="image-convert-indexed" />
-	<separator />
-      </menu>
@@ -343,22 +336,0 @@
-      <menu action="layers-colors-menu" name="Colors">
-        <menuitem action="tools-color-balance" />
-        <menuitem action="tools-hue-saturation" />
-        <menuitem action="tools-colorize" />
-        <menuitem action="tools-brightness-contrast" />
-        <menuitem action="tools-threshold" />
-        <menuitem action="tools-levels" />
-        <menuitem action="tools-curves" />
-        <menuitem action="tools-posterize" />
-	<separator />
-        <menuitem action="drawable-desaturate" />
-        <menuitem action="drawable-invert" />
-	<menu action="layers-colors-auto-menu" name="Auto">
-	  <menuitem action="drawable-equalize" />
-	  <menuitem action="drawable-levels-stretch" />
-	</menu>
-	<separator />
-        <placeholder name="Info">
-          <menuitem action="dialogs-histogram" />
-        </placeholder>
-        <separator />
-      </menu>
@@ -451,0 +424,33 @@
+    <menu action="layers-colors-menu" name="Colors">
+      <separator />
+      <menu action="image-mode-menu" name="Mode">
+        <menuitem action="image-convert-rgb" />
+        <menuitem action="image-convert-grayscale" />
+        <menuitem action="image-convert-indexed" />
+      </menu>
+      <separator />
+      <menuitem action="tools-color-balance" />
+      <menuitem action="tools-hue-saturation" />
+      <menuitem action="tools-colorize" />
+      <menuitem action="tools-brightness-contrast" />
+      <menuitem action="tools-threshold" />
+      <menuitem action="tools-levels" />
+      <menuitem action="tools-curves" />
+      <menuitem action="tools-posterize" />
+      <separator />
+      <menuitem action="drawable-desaturate" />
+      <menuitem action="drawable-invert" />
+      <menu action="layers-colors-auto-menu" name="Auto">
+        <menuitem action="drawable-equalize" />
+        <menuitem action="drawable-levels-stretch" />
+      </menu>
+      <separator />
+      <placeholder name="Info">
+        <menuitem action="dialogs-histogram" />
+      </placeholder>
+      <separator />
+      <placeholder action="plug-in-colors-menu" name="Color Plug-Ins">
+	<menu action="plug-in-colors-map-menu" name="Map" />
+      </placeholder>
+    </menu>
+
@@ -522,3 +526,0 @@
-      <menu action="plug-in-colors-menu" name="Colors">
-	<menu action="plug-in-colors-map-menu" name="Map" />
-      </menu>
Index: plug-ins/common/AlienMap2.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/AlienMap2.c,v
retrieving revision 1.47
diff -u -p -p -0 -r1.47 AlienMap2.c
--- plug-ins/common/AlienMap2.c	30 Jun 2005 16:03:14 -0000	1.47
+++ plug-ins/common/AlienMap2.c	1 Aug 2005 04:54:04 -0000
@@ -194 +194 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_alienmap2", "<Image>/Filters/Colors/Map");
+  gimp_plugin_menu_register ("plug_in_alienmap2", "<Image>/Colors/Map");
Index: plug-ins/common/autostretch_hsv.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/autostretch_hsv.c,v
retrieving revision 1.28
diff -u -p -p -0 -r1.28 autostretch_hsv.c
--- plug-ins/common/autostretch_hsv.c	2 Nov 2004 12:00:24 -0000	1.28
+++ plug-ins/common/autostretch_hsv.c	1 Aug 2005 04:54:04 -0000
@@ -87 +87 @@ query (void)
-                             "<Image>/Layer/Colors/Auto");
+                             "<Image>/Colors/Auto");
Index: plug-ins/common/borderaverage.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/borderaverage.c,v
retrieving revision 1.46
diff -u -p -p -0 -r1.46 borderaverage.c
--- plug-ins/common/borderaverage.c	30 Jun 2005 16:03:14 -0000	1.46
+++ plug-ins/common/borderaverage.c	1 Aug 2005 04:54:04 -0000
@@ -107 +107 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_borderaverage", "<Image>/Filters/Colors");
+  gimp_plugin_menu_register ("plug_in_borderaverage", "<Image>/Colors");
Index: plug-ins/common/c_astretch.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/c_astretch.c,v
retrieving revision 1.25
diff -u -p -p -0 -r1.25 c_astretch.c
--- plug-ins/common/c_astretch.c	2 Nov 2004 12:00:24 -0000	1.25
+++ plug-ins/common/c_astretch.c	1 Aug 2005 04:54:04 -0000
@@ -84 +84 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_c_astretch", "<Image>/Layer/Colors/Auto");
+  gimp_plugin_menu_register ("plug_in_c_astretch", "<Image>/Colors/Auto");
Index: plug-ins/common/ccanalyze.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/ccanalyze.c,v
retrieving revision 1.23
diff -u -p -p -0 -r1.23 ccanalyze.c
--- plug-ins/common/ccanalyze.c	4 Mar 2005 15:12:27 -0000	1.23
+++ plug-ins/common/ccanalyze.c	1 Aug 2005 04:54:04 -0000
@@ -116,2 +116,2 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_ccanalyze", "<Image>/Filters/Colors");
-  gimp_plugin_menu_register ("plug_in_ccanalyze", "<Image>/Layer/Colors/Info");
+  gimp_plugin_menu_register ("plug_in_ccanalyze", "<Image>/Colors");
+  gimp_plugin_menu_register ("plug_in_ccanalyze", "<Image>/Colors/Info");
Index: plug-ins/common/channel_mixer.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/channel_mixer.c,v
retrieving revision 1.24
diff -u -p -p -0 -r1.24 channel_mixer.c
--- plug-ins/common/channel_mixer.c	30 Jun 2005 16:03:14 -0000	1.24
+++ plug-ins/common/channel_mixer.c	1 Aug 2005 04:54:05 -0000
@@ -190 +190 @@ query (void)
-  gimp_plugin_menu_register (PLUG_IN_NAME, "<Image>/Filters/Colors");
+  gimp_plugin_menu_register (PLUG_IN_NAME, "<Image>/Colors");
Index: plug-ins/common/color_enhance.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/color_enhance.c,v
retrieving revision 1.25
diff -u -p -p -0 -r1.25 color_enhance.c
--- plug-ins/common/color_enhance.c	2 Nov 2004 12:00:24 -0000	1.25
+++ plug-ins/common/color_enhance.c	1 Aug 2005 04:54:05 -0000
@@ -87 +87 @@ query (void)
-                             "<Image>/Layer/Colors/Auto");
+                             "<Image>/Colors/Auto");
Index: plug-ins/common/colorify.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/colorify.c,v
retrieving revision 1.47
diff -u -p -p -0 -r1.47 colorify.c
--- plug-ins/common/colorify.c	30 Jun 2005 16:03:14 -0000	1.47
+++ plug-ins/common/colorify.c	1 Aug 2005 04:54:05 -0000
@@ -116 +116 @@ query (void)
-  gimp_plugin_menu_register (PLUG_IN_NAME, "<Image>/Filters/Colors");
+  gimp_plugin_menu_register (PLUG_IN_NAME, "<Image>/Colors");
Index: plug-ins/common/colortoalpha.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/colortoalpha.c,v
retrieving revision 1.58
diff -u -p -p -0 -r1.58 colortoalpha.c
--- plug-ins/common/colortoalpha.c	10 Jul 2005 21:17:20 -0000	1.58
+++ plug-ins/common/colortoalpha.c	1 Aug 2005 04:54:05 -0000
@@ -108 +108 @@ query (void)
-                             "<Image>/Filters/Colors");
+                             "<Image>/Colors");
Index: plug-ins/common/compose.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/compose.c,v
retrieving revision 1.61
diff -u -p -p -0 -r1.61 compose.c
--- plug-ins/common/compose.c	16 Mar 2005 23:56:17 -0000	1.61
+++ plug-ins/common/compose.c	1 Aug 2005 04:54:05 -0000
@@ -320 +320 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_compose", "<Image>/Filters/Colors");
+  gimp_plugin_menu_register ("plug_in_compose", "<Image>/Colors");
@@ -351 +351 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_recompose", "<Image>/Filters/Colors");
+  gimp_plugin_menu_register ("plug_in_recompose", "<Image>/Colors");
Index: plug-ins/common/decompose.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/decompose.c,v
retrieving revision 1.57
diff -u -p -p -0 -r1.57 decompose.c
--- plug-ins/common/decompose.c	4 Mar 2005 15:12:27 -0000	1.57
+++ plug-ins/common/decompose.c	1 Aug 2005 04:54:05 -0000
@@ -251 +251 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_decompose", "<Image>/Filters/Colors");
+  gimp_plugin_menu_register ("plug_in_decompose", "<Image>/Colors");
Index: plug-ins/common/exchange.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/exchange.c,v
retrieving revision 1.63
diff -u -p -p -0 -r1.63 exchange.c
--- plug-ins/common/exchange.c	30 Jun 2005 16:03:14 -0000	1.63
+++ plug-ins/common/exchange.c	1 Aug 2005 04:54:05 -0000
@@ -133 +133 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_exchange", "<Image>/Filters/Colors/Map");
+  gimp_plugin_menu_register ("plug_in_exchange", "<Image>/Colors/Map");
Index: plug-ins/common/fp.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/fp.c,v
retrieving revision 1.39
diff -u -p -p -0 -r1.39 fp.c
--- plug-ins/common/fp.c	30 Jun 2005 16:03:14 -0000	1.39
+++ plug-ins/common/fp.c	1 Aug 2005 04:54:06 -0000
@@ -334 +334 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_filter_pack", "<Image>/Filters/Colors");
+  gimp_plugin_menu_register ("plug_in_filter_pack", "<Image>/Colors");
Index: plug-ins/common/gradmap.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/gradmap.c,v
retrieving revision 1.28
diff -u -p -p -0 -r1.28 gradmap.c
--- plug-ins/common/gradmap.c	1 Jan 2005 19:31:03 -0000	1.28
+++ plug-ins/common/gradmap.c	1 Aug 2005 04:54:06 -0000
@@ -105 +105 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_gradmap", "<Image>/Filters/Colors/Map");
+  gimp_plugin_menu_register ("plug_in_gradmap", "<Image>/Colors/Map");
@@ -128 +128 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_palettemap", "<Image>/Filters/Colors/Map");
+  gimp_plugin_menu_register ("plug_in_palettemap", "<Image>/Colors/Map");
Index: plug-ins/common/hot.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/hot.c,v
retrieving revision 1.41
diff -u -p -p -0 -r1.41 hot.c
--- plug-ins/common/hot.c	31 May 2005 19:10:45 -0000	1.41
+++ plug-ins/common/hot.c	1 Aug 2005 04:54:06 -0000
@@ -219 +219 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_hot", "<Image>/Filters/Colors");
+  gimp_plugin_menu_register ("plug_in_hot", "<Image>/Colors");
Index: plug-ins/common/mapcolor.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/mapcolor.c,v
retrieving revision 1.53
diff -u -p -p -0 -r1.53 mapcolor.c
--- plug-ins/common/mapcolor.c	30 Jun 2005 16:03:14 -0000	1.53
+++ plug-ins/common/mapcolor.c	1 Aug 2005 04:54:06 -0000
@@ -156 +156 @@ query (void)
-                             "<Image>/Filters/Colors/Map");
+                             "<Image>/Colors/Map");
@@ -174 +174 @@ query (void)
-                             "<Image>/Filters/Colors/Map");
+                             "<Image>/Colors/Map");
Index: plug-ins/common/max_rgb.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/max_rgb.c,v
retrieving revision 1.61
diff -u -p -p -0 -r1.61 max_rgb.c
--- plug-ins/common/max_rgb.c	4 Mar 2005 15:12:28 -0000	1.61
+++ plug-ins/common/max_rgb.c	1 Aug 2005 04:54:06 -0000
@@ -107 +107 @@ query (void)
-  gimp_plugin_menu_register (PLUG_IN_NAME, "<Image>/Filters/Colors");
+  gimp_plugin_menu_register (PLUG_IN_NAME, "<Image>/Colors");
Index: plug-ins/common/normalize.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/normalize.c,v
retrieving revision 1.26
diff -u -p -p -0 -r1.26 normalize.c
--- plug-ins/common/normalize.c	4 Mar 2005 15:12:28 -0000	1.26
+++ plug-ins/common/normalize.c	1 Aug 2005 04:54:06 -0000
@@ -93 +93 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_normalize", "<Image>/Layer/Colors/Auto");
+  gimp_plugin_menu_register ("plug_in_normalize", "<Image>/Colors/Auto");
Index: plug-ins/common/retinex.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/retinex.c,v
retrieving revision 1.12
diff -u -p -p -0 -r1.12 retinex.c
--- plug-ins/common/retinex.c	30 Jun 2005 16:03:14 -0000	1.12
+++ plug-ins/common/retinex.c	1 Aug 2005 04:54:06 -0000
@@ -172 +172 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_retinex", "<Image>/Filters/Colors");
+  gimp_plugin_menu_register ("plug_in_retinex", "<Image>/Colors");
Index: plug-ins/common/sample_colorize.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/sample_colorize.c,v
retrieving revision 1.63
diff -u -p -p -0 -r1.63 sample_colorize.c
--- plug-ins/common/sample_colorize.c	30 Jun 2005 16:03:14 -0000	1.63
+++ plug-ins/common/sample_colorize.c	1 Aug 2005 04:54:07 -0000
@@ -302 +302 @@ query (void)
-                             "<Image>/Filters/Colors/Map");
+                             "<Image>/Colors/Map");
Index: plug-ins/common/semiflatten.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/semiflatten.c,v
retrieving revision 1.22
diff -u -p -p -0 -r1.22 semiflatten.c
--- plug-ins/common/semiflatten.c	4 Mar 2005 15:12:28 -0000	1.22
+++ plug-ins/common/semiflatten.c	1 Aug 2005 04:54:07 -0000
@@ -81 +81 @@ query (void)
-                             "<Image>/Filters/Colors");
+                             "<Image>/Colors");
Index: plug-ins/common/smooth_palette.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/smooth_palette.c,v
retrieving revision 1.52
diff -u -p -p -0 -r1.52 smooth_palette.c
--- plug-ins/common/smooth_palette.c	30 Jun 2005 16:03:14 -0000	1.52
+++ plug-ins/common/smooth_palette.c	1 Aug 2005 04:54:07 -0000
@@ -91 +91 @@ query (void)
-                             "<Image>/Filters/Colors");
+                             "<Image>/Colors");
Index: plug-ins/common/vinvert.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/vinvert.c,v
retrieving revision 1.32
diff -u -p -p -0 -r1.32 vinvert.c
--- plug-ins/common/vinvert.c	4 Mar 2005 15:12:28 -0000	1.32
+++ plug-ins/common/vinvert.c	1 Aug 2005 04:54:07 -0000
@@ -87 +87 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_vinvert", "<Image>/Filters/Colors");
+  gimp_plugin_menu_register ("plug_in_vinvert", "<Image>/Colors");
Index: plug-ins/rcm/rcm.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/rcm/rcm.c,v
retrieving revision 1.28
diff -u -p -p -0 -r1.28 rcm.c
--- plug-ins/rcm/rcm.c	4 Mar 2005 13:23:29 -0000	1.28
+++ plug-ins/rcm/rcm.c	1 Aug 2005 04:54:07 -0000
@@ -110 +110 @@ query (void)
-                             "<Image>/Filters/Colors/Map");
+                             "<Image>/Colors/Map");
Index: plug-ins/script-fu/scripts/hsv-graph.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/hsv-graph.scm,v
retrieving revision 1.24
diff -u -p -p -0 -r1.24 hsv-graph.scm
--- plug-ins/script-fu/scripts/hsv-graph.scm	16 Jun 2005 23:45:32 -0000	1.24
+++ plug-ins/script-fu/scripts/hsv-graph.scm	1 Aug 2005 04:54:07 -0000
@@ -352 +352 @@
-			 "<Image>/Filters/Colors")
+			 "<Image>/Colors")
