Index: app/actions/plug-in-actions.c
===================================================================
RCS file: /cvs/gnome/gimp/app/actions/plug-in-actions.c,v
retrieving revision 1.32
diff -u -p -u -p -0 -r1.32 plug-in-actions.c
--- app/actions/plug-in-actions.c	22 Jun 2005 12:16:03 -0000	1.32
+++ app/actions/plug-in-actions.c	23 Jun 2005 17:17:52 -0000
@@ -69,3 +69,2 @@ static GimpActionEntry plug_in_actions[]
-  { "plug-in-generic-menu",        NULL, N_("_Generic")       },
-  { "plug-in-glass-effects-menu",  NULL, N_("Gla_ss Effects") },
-  { "plug-in-light-effects-menu",  NULL, N_("_Light Effects") },
+  { "plug-in-generic-menu",        NULL, N_("_Effects")       },
+  { "plug-in-light-shadow-menu",   NULL, N_("_Light and Shadow") },
Index: menus/image-menu.xml.in
===================================================================
RCS file: /cvs/gnome/gimp/menus/image-menu.xml.in,v
retrieving revision 1.45
diff -u -p -u -p -0 -r1.45 image-menu.xml.in
--- menus/image-menu.xml.in	22 Jun 2005 13:24:22 -0000	1.45
+++ menus/image-menu.xml.in	23 Jun 2005 17:17:52 -0000
@@ -524,5 +524 @@
-      <menu action="plug-in-noise-menu" name="Noise" />
-      <menu action="plug-in-edge-detect-menu" name="Edge-Detect" />
-      <menu action="plug-in-generic-menu" name="Generic" />
-      <separator />
-      <menu action="plug-in-light-effects-menu" name="Light Effects">
+      <menu action="plug-in-light-shadow-menu" name="Light and Shadow">
@@ -530,0 +527,2 @@
+        <placeholder name="Shadow" />
+	<separator />
@@ -532,0 +531,10 @@
+      <menu action="plug-in-noise-menu" name="Noise" />
+      <menu action="plug-in-edge-detect-menu" name="Edge-Detect" />
+      <menu action="plug-in-generic-menu" name="Effects">
+        <placeholder name="Generic" />
+	<separator />
+        <placeholder name="Alchemy" />
+	<separator />
+        <placeholder name="Combine" />
+      </menu>
+      <separator />
@@ -542 +549,0 @@
-      <separator />
@@ -544 +550,0 @@
-      <menu action="plug-in-combine-menu" name="Combine" />
Index: plug-ins/Lighting/lighting_main.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/Lighting/lighting_main.c,v
retrieving revision 1.42
diff -u -p -u -p -0 -r1.42 lighting_main.c
--- plug-ins/Lighting/lighting_main.c	16 Jun 2005 23:45:30 -0000	1.42
+++ plug-ins/Lighting/lighting_main.c	23 Jun 2005 17:17:53 -0000
@@ -204 +204 @@ query (void)
-                             "<Image>/Filters/Light Effects/Light");
+                             "<Image>/Filters/Light and Shadow/Light");
Index: plug-ins/common/apply_lens.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/apply_lens.c,v
retrieving revision 1.53
diff -u -p -u -p -0 -r1.53 apply_lens.c
--- plug-ins/common/apply_lens.c	16 Jun 2005 23:45:30 -0000	1.53
+++ plug-ins/common/apply_lens.c	23 Jun 2005 17:17:53 -0000
@@ -117 +117 @@ query (void)
-                             "<Image>/Filters/Light Effects/Glass");
+                             "<Image>/Filters/Light and Shadow/Glass");
Index: plug-ins/common/convmatrix.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/convmatrix.c,v
retrieving revision 1.52
diff -u -p -u -p -0 -r1.52 convmatrix.c
--- plug-ins/common/convmatrix.c	11 Apr 2005 21:42:28 -0000	1.52
+++ plug-ins/common/convmatrix.c	23 Jun 2005 17:17:53 -0000
@@ -193 +193 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_convmatrix", "<Image>/Filters/Generic");
+  gimp_plugin_menu_register ("plug_in_convmatrix", "<Image>/Filters/Effects/Generic");
Index: plug-ins/common/depthmerge.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/depthmerge.c,v
retrieving revision 1.43
diff -u -p -u -p -0 -r1.43 depthmerge.c
--- plug-ins/common/depthmerge.c	4 Mar 2005 15:12:27 -0000	1.43
+++ plug-ins/common/depthmerge.c	23 Jun 2005 17:17:53 -0000
@@ -193 +193 @@ query (void)
-  gimp_plugin_menu_register (PLUG_IN_NAME, "<Image>/Filters/Combine");
+  gimp_plugin_menu_register (PLUG_IN_NAME, "<Image>/Filters/Effects/Combine");
Index: plug-ins/common/film.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/film.c,v
retrieving revision 1.73
diff -u -p -u -p -0 -r1.73 film.c
--- plug-ins/common/film.c	16 Jun 2005 23:45:30 -0000	1.73
+++ plug-ins/common/film.c	23 Jun 2005 17:17:53 -0000
@@ -242 +242 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_film", "<Image>/Filters/Combine");
+  gimp_plugin_menu_register ("plug_in_film", "<Image>/Filters/Effects/Combine");
Index: plug-ins/common/flarefx.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/flarefx.c,v
retrieving revision 1.63
diff -u -p -u -p -0 -r1.63 flarefx.c
--- plug-ins/common/flarefx.c	16 Jun 2005 23:45:30 -0000	1.63
+++ plug-ins/common/flarefx.c	23 Jun 2005 17:17:54 -0000
@@ -201 +201 @@ query (void)
-                             "<Image>/Filters/Light Effects/Light");
+                             "<Image>/Filters/Light and Shadow/Light");
Index: plug-ins/common/glasstile.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/glasstile.c,v
retrieving revision 1.62
diff -u -p -u -p -0 -r1.62 glasstile.c
--- plug-ins/common/glasstile.c	16 Jun 2005 23:45:30 -0000	1.62
+++ plug-ins/common/glasstile.c	23 Jun 2005 17:17:54 -0000
@@ -134 +134 @@ query (void)
-                             "<Image>/Filters/Light Effects/Glass");
+                             "<Image>/Filters/Light and Shadow/Glass");
Index: plug-ins/common/lic.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/lic.c,v
retrieving revision 1.57
diff -u -p -u -p -0 -r1.57 lic.c
--- plug-ins/common/lic.c	4 Mar 2005 15:12:28 -0000	1.57
+++ plug-ins/common/lic.c	23 Jun 2005 17:17:54 -0000
@@ -818 +818 @@ query (void)
-  gimp_plugin_menu_register ("plug_in_lic", "<Image>/Filters/Map");
+  gimp_plugin_menu_register ("plug_in_lic", "<Image>/Filters/Artistic");
Index: plug-ins/common/nova.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/nova.c,v
retrieving revision 1.79
diff -u -p -u -p -0 -r1.79 nova.c
--- plug-ins/common/nova.c	16 Jun 2005 23:45:30 -0000	1.79
+++ plug-ins/common/nova.c	23 Jun 2005 17:17:54 -0000
@@ -183 +183 @@ query (void)
-                             "<Image>/Filters/Light Effects/Light");
+                             "<Image>/Filters/Light and Shadow/Light");
Index: plug-ins/common/sparkle.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/sparkle.c,v
retrieving revision 1.76
diff -u -p -u -p -0 -r1.76 sparkle.c
--- plug-ins/common/sparkle.c	16 Jun 2005 23:45:30 -0000	1.76
+++ plug-ins/common/sparkle.c	23 Jun 2005 17:17:54 -0000
@@ -192 +192 @@ query (void)
-                             "<Image>/Filters/Light Effects/Light");
+                             "<Image>/Filters/Light and Shadow/Light");
Index: plug-ins/common/vpropagate.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/vpropagate.c,v
retrieving revision 1.56
diff -u -p -u -p -0 -r1.56 vpropagate.c
--- plug-ins/common/vpropagate.c	4 Mar 2005 15:12:28 -0000	1.56
+++ plug-ins/common/vpropagate.c	23 Jun 2005 17:17:54 -0000
@@ -270,2 +270,2 @@ query (void)
-  gimp_plugin_menu_register (ERODE_PLUG_IN_NAME,   "<Image>/Filters/Generic");
-  gimp_plugin_menu_register (DILATE_PLUG_IN_NAME,  "<Image>/Filters/Generic");
+  gimp_plugin_menu_register (ERODE_PLUG_IN_NAME,   "<Image>/Filters/Effects/Generic");
+  gimp_plugin_menu_register (DILATE_PLUG_IN_NAME,  "<Image>/Filters/Effects/Generic");
Index: plug-ins/gflare/gflare.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/gflare/gflare.c,v
retrieving revision 1.110
diff -u -p -u -p -0 -r1.110 gflare.c
--- plug-ins/gflare/gflare.c	16 Jun 2005 23:45:31 -0000	1.110
+++ plug-ins/gflare/gflare.c	23 Jun 2005 17:17:55 -0000
@@ -827 +827 @@ plugin_query (void)
-                             "<Image>/Filters/Light Effects/Light");
+                             "<Image>/Filters/Light and Shadow/Light");
Index: plug-ins/pygimp/doc/pygimp.sgml
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/pygimp/doc/pygimp.sgml,v
retrieving revision 1.3
diff -u -p -u -p -0 -r1.3 pygimp.sgml
--- plug-ins/pygimp/doc/pygimp.sgml	11 Nov 1999 14:21:23 -0000	1.3
+++ plug-ins/pygimp/doc/pygimp.sgml	23 Jun 2005 17:17:56 -0000
@@ -156 +156 @@ register(
-	"&lt;Image&gt;/Python-Fu/Alchemy/Clothify",
+	"&lt;Image&gt;/Filters/Artistic/Clothify",
Index: plug-ins/pygimp/doc/pygimp.html
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/pygimp/doc/pygimp.html,v
retrieving revision 1.3
diff -u -p -u -p -0 -r1.3 pygimp.html
--- plug-ins/pygimp/doc/pygimp.html	7 Jan 2003 06:15:55 -0000	1.3
+++ plug-ins/pygimp/doc/pygimp.html	23 Jun 2005 17:17:56 -0000
@@ -535 +535 @@ register(
-	"&#60;Image&#62;/Python-Fu/Alchemy/Clothify",
+	"&#60;Image&#62;/Filters/Artistic/Clothify",
@@ -5402 +5402 @@ TARGET="_top"
->
\ No newline at end of file
+>
Index: plug-ins/pygimp/doc/structure-of-plugin.html
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/pygimp/doc/structure-of-plugin.html,v
retrieving revision 1.1
diff -u -p -u -p -0 -r1.1 structure-of-plugin.html
--- plug-ins/pygimp/doc/structure-of-plugin.html	5 Sep 1999 15:46:57 -0000	1.1
+++ plug-ins/pygimp/doc/structure-of-plugin.html	23 Jun 2005 17:17:56 -0000
@@ -165 +165 @@ register(
-	"&#60;Image&#62;/Python-Fu/Alchemy/Clothify",
+	"&#60;Image&#62;/Filters/Artistic/Clothify",
@@ -573 +573 @@ VALIGN="top"
->
\ No newline at end of file
+>
Index: plug-ins/pygimp/plug-ins/clothify.py
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/pygimp/plug-ins/clothify.py,v
retrieving revision 1.13
diff -u -p -u -p -0 -r1.13 clothify.py
--- plug-ins/pygimp/plug-ins/clothify.py	16 Jun 2005 23:45:31 -0000	1.13
+++ plug-ins/pygimp/plug-ins/clothify.py	23 Jun 2005 17:17:56 -0000
@@ -64 +64 @@ register(
-        "<Image>/Filters/Alchemy/_Clothify...",
+        "<Image>/Filters/Artistic/_Clothify...",
Index: plug-ins/pygimp/plug-ins/shadow_bevel.py
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/pygimp/plug-ins/shadow_bevel.py,v
retrieving revision 1.12
diff -u -p -u -p -0 -r1.12 shadow_bevel.py
--- plug-ins/pygimp/plug-ins/shadow_bevel.py	16 Jun 2005 23:45:31 -0000	1.12
+++ plug-ins/pygimp/plug-ins/shadow_bevel.py	23 Jun 2005 17:17:56 -0000
@@ -63 +63 @@ register(
-    "<Image>/Filters/Shadow/_Drop Shadow and Bevel...",
+    "<Image>/Filters/Light and Shadow/Shadow/_Drop Shadow and Bevel...",
Index: plug-ins/script-fu/script-fu.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/script-fu.c,v
retrieving revision 1.81
diff -u -p -u -p -0 -r1.81 script-fu.c
--- plug-ins/script-fu/script-fu.c	16 Jun 2005 23:45:31 -0000	1.81
+++ plug-ins/script-fu/script-fu.c	23 Jun 2005 17:17:56 -0000
@@ -296,2 +295,0 @@ script_fu_extension_init (void)
-                                    N_("_Alchemy"));
-  gimp_plugin_menu_branch_register ("<Image>/Filters",
@@ -307,2 +304,0 @@ script_fu_extension_init (void)
-  gimp_plugin_menu_branch_register ("<Image>/Filters",
-                                    N_("S_hadow"));
@@ -311,2 +306,0 @@ script_fu_extension_init (void)
-  gimp_plugin_menu_branch_register ("<Image>/Filters",
-                                    N_("_Utils"));
Index: plug-ins/script-fu/scripts/clothify.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/clothify.scm,v
retrieving revision 1.19
diff -u -p -u -p -0 -r1.19 clothify.scm
--- plug-ins/script-fu/scripts/clothify.scm	16 Jun 2005 23:45:32 -0000	1.19
+++ plug-ins/script-fu/scripts/clothify.scm	23 Jun 2005 17:17:56 -0000
@@ -63 +63 @@
-			 "<Image>/Filters/Alchemy")
+			 "<Image>/Filters/Artistic")
Index: plug-ins/script-fu/scripts/drop-shadow.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/drop-shadow.scm,v
retrieving revision 1.21
diff -u -p -u -p -0 -r1.21 drop-shadow.scm
--- plug-ins/script-fu/scripts/drop-shadow.scm	16 Jun 2005 23:45:32 -0000	1.21
+++ plug-ins/script-fu/scripts/drop-shadow.scm	23 Jun 2005 17:17:56 -0000
@@ -178 +178 @@
-			 "<Image>/Filters/Shadow")
+			 "<Image>/Filters/Light and Shadow/Shadow")
Index: plug-ins/script-fu/scripts/erase-rows.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/erase-rows.scm,v
retrieving revision 1.19
diff -u -p -u -p -0 -r1.19 erase-rows.scm
--- plug-ins/script-fu/scripts/erase-rows.scm	16 Jun 2005 23:45:32 -0000	1.19
+++ plug-ins/script-fu/scripts/erase-rows.scm	23 Jun 2005 17:17:56 -0000
@@ -41 +41 @@
-			 "<Image>/Filters/Alchemy")
+			 "<Image>/Filters/Effects/Alchemy")
Index: plug-ins/script-fu/scripts/perspective-shadow.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/perspective-shadow.scm,v
retrieving revision 1.26
diff -u -p -u -p -0 -r1.26 perspective-shadow.scm
--- plug-ins/script-fu/scripts/perspective-shadow.scm	16 Jun 2005 23:45:32 -0000	1.26
+++ plug-ins/script-fu/scripts/perspective-shadow.scm	23 Jun 2005 17:17:56 -0000
@@ -196 +196 @@
-			 "<Image>/Filters/Shadow")
+			 "<Image>/Filters/Light and Shadow/Shadow")
Index: plug-ins/script-fu/scripts/predator.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/predator.scm,v
retrieving revision 1.22
diff -u -p -u -p -0 -r1.22 predator.scm
--- plug-ins/script-fu/scripts/predator.scm	16 Jun 2005 23:45:32 -0000	1.22
+++ plug-ins/script-fu/scripts/predator.scm	23 Jun 2005 17:17:56 -0000
@@ -125 +125 @@
-			 "<Image>/Filters/Alchemy")
+			 "<Image>/Filters/Effects/Alchemy")
Index: plug-ins/script-fu/scripts/weave.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/weave.scm,v
retrieving revision 1.25
diff -u -p -u -p -0 -r1.25 weave.scm
--- plug-ins/script-fu/scripts/weave.scm	16 Jun 2005 23:45:32 -0000	1.25
+++ plug-ins/script-fu/scripts/weave.scm	23 Jun 2005 17:17:56 -0000
@@ -406 +406 @@
-			 "<Image>/Filters/Alchemy")
+			 "<Image>/Filters/Artistic")
Index: plug-ins/script-fu/scripts/xach-effect.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/xach-effect.scm,v
retrieving revision 1.24
diff -u -p -u -p -0 -r1.24 xach-effect.scm
--- plug-ins/script-fu/scripts/xach-effect.scm	16 Jun 2005 23:45:32 -0000	1.24
+++ plug-ins/script-fu/scripts/xach-effect.scm	23 Jun 2005 17:17:56 -0000
@@ -134 +134 @@
-			 "<Image>/Filters/Shadow")
+			 "<Image>/Filters/Light and Shadow/Shadow")
