Index: menus/image-menu.xml.in
===================================================================
RCS file: /cvs/gnome/gimp/menus/image-menu.xml.in,v
retrieving revision 1.42
diff -u -r1.42 image-menu.xml.in
--- menus/image-menu.xml.in	4 Apr 2005 23:48:19 -0000	1.42
+++ menus/image-menu.xml.in	7 Jun 2005 22:38:18 -0000
@@ -514,17 +514,20 @@
       <menuitem action="plug-in-reset-all" />
       <separator />
       <menu action="plug-in-blur-menu" name="Blur" />
+      <menu action="plug-in-enhance-menu" name="Enhance" />
+      <menu action="plug-in-distorts-menu" name="Distorts" />
       <menu action="plug-in-colors-menu" name="Colors">
 	<menu action="plug-in-colors-map-menu" name="Map" />
       </menu>
       <menu action="plug-in-noise-menu" name="Noise" />
       <menu action="plug-in-edge-detect-menu" name="Edge-Detect" />
-      <menu action="plug-in-enhance-menu" name="Enhance" />
       <menu action="plug-in-generic-menu" name="Generic" />
       <separator />
-      <menu action="plug-in-glass-effects-menu" name="Glass Effects" />
-      <menu action="plug-in-light-effects-menu" name="Light Effects" />
-      <menu action="plug-in-distorts-menu" name="Distorts" />
+      <menu action="plug-in-light-effects-menu" name="Light Effects">
+        <placeholder name="Light" />
+	<separator />
+        <placeholder name="Glass" />
+      </menu>
       <menu action="plug-in-artistic-menu" name="Artistic" />
       <menu action="plug-in-map-menu" name="Map" />
       <menu action="plug-in-render-menu" name="Render">
Index: plug-ins/Lighting/lighting_main.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/Lighting/lighting_main.c,v
retrieving revision 1.41
diff -u -r1.41 lighting_main.c
--- plug-ins/Lighting/lighting_main.c	12 Oct 2004 21:48:38 -0000	1.41
+++ plug-ins/Lighting/lighting_main.c	7 Jun 2005 22:38:18 -0000
@@ -201,7 +201,7 @@
                           args, NULL);
 
   gimp_plugin_menu_register ("plug_in_lighting",
-                             "<Image>/Filters/Light Effects");
+                             "<Image>/Filters/Light Effects/Light");
 }
 
 static void
Index: plug-ins/common/apply_lens.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/apply_lens.c,v
retrieving revision 1.52
diff -u -r1.52 apply_lens.c
--- plug-ins/common/apply_lens.c	4 Mar 2005 15:12:27 -0000	1.52
+++ plug-ins/common/apply_lens.c	7 Jun 2005 22:38:18 -0000
@@ -114,7 +114,7 @@
                           args, NULL);
 
   gimp_plugin_menu_register ("plug_in_applylens",
-                             "<Image>/Filters/Glass Effects");
+                             "<Image>/Filters/Light Effects/Glass");
 }
 
 static void
Index: plug-ins/common/flarefx.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/flarefx.c,v
retrieving revision 1.62
diff -u -r1.62 flarefx.c
--- plug-ins/common/flarefx.c	4 Mar 2005 15:12:28 -0000	1.62
+++ plug-ins/common/flarefx.c	7 Jun 2005 22:38:19 -0000
@@ -198,7 +198,7 @@
                           args, NULL);
 
   gimp_plugin_menu_register ("plug_in_flarefx",
-                             "<Image>/Filters/Light Effects");
+                             "<Image>/Filters/Light Effects/Light");
 }
 
 static void
Index: plug-ins/common/glasstile.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/glasstile.c,v
retrieving revision 1.61
diff -u -r1.61 glasstile.c
--- plug-ins/common/glasstile.c	4 Mar 2005 15:12:28 -0000	1.61
+++ plug-ins/common/glasstile.c	7 Jun 2005 22:38:20 -0000
@@ -131,7 +131,7 @@
                           args, NULL);
 
   gimp_plugin_menu_register ("plug_in_glasstile",
-                             "<Image>/Filters/Glass Effects");
+                             "<Image>/Filters/Light Effects/Glass");
 }
 
 static void
Index: plug-ins/common/nova.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/nova.c,v
retrieving revision 1.78
diff -u -r1.78 nova.c
--- plug-ins/common/nova.c	4 Mar 2005 15:12:28 -0000	1.78
+++ plug-ins/common/nova.c	7 Jun 2005 22:38:20 -0000
@@ -179,7 +179,8 @@
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
-  gimp_plugin_menu_register ("plug_in_nova", "<Image>/Filters/Light Effects");
+  gimp_plugin_menu_register ("plug_in_nova",
+                             "<Image>/Filters/Light Effects/Light");
 }
 
 static void
Index: plug-ins/common/sparkle.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/sparkle.c,v
retrieving revision 1.75
diff -u -r1.75 sparkle.c
--- plug-ins/common/sparkle.c	21 Mar 2005 23:59:12 -0000	1.75
+++ plug-ins/common/sparkle.c	7 Jun 2005 22:38:21 -0000
@@ -189,7 +189,7 @@
                           args, NULL);
 
   gimp_plugin_menu_register ("plug_in_sparkle",
-                             "<Image>/Filters/Light Effects");
+                             "<Image>/Filters/Light Effects/Light");
 }
 
 static void
Index: plug-ins/common/unsharp.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/unsharp.c,v
retrieving revision 1.83
diff -u -r1.83 unsharp.c
--- plug-ins/common/unsharp.c	4 Mar 2005 15:12:28 -0000	1.83
+++ plug-ins/common/unsharp.c	7 Jun 2005 22:38:22 -0000
@@ -136,7 +136,7 @@
                           "Winston Chang <winstonc@cs.wisc.edu>",
                           "Winston Chang",
                           "1999",
-                          N_("_Unsharp Mask..."),
+                          N_("_Unsharp Mask ..."),
                           "GRAY*, RGB*",
                           GIMP_PLUGIN,
                           G_N_ELEMENTS (args), 0,
Index: plug-ins/gflare/gflare.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/gflare/gflare.c,v
retrieving revision 1.109
diff -u -r1.109 gflare.c
--- plug-ins/gflare/gflare.c	7 Apr 2005 17:10:04 -0000	1.109
+++ plug-ins/gflare/gflare.c	7 Jun 2005 22:38:25 -0000
@@ -824,7 +824,7 @@
                           args, NULL);
 
   gimp_plugin_menu_register ("plug_in_gflare",
-                             "<Image>/Filters/Light Effects");
+                             "<Image>/Filters/Light Effects/Light");
 }
 
 void
Index: plug-ins/pygimp/plug-ins/clothify.py
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/pygimp/plug-ins/clothify.py,v
retrieving revision 1.12
diff -u -r1.12 clothify.py
--- plug-ins/pygimp/plug-ins/clothify.py	3 Jun 2005 23:15:23 -0000	1.12
+++ plug-ins/pygimp/plug-ins/clothify.py	7 Jun 2005 22:38:26 -0000
@@ -61,7 +61,7 @@
         "James Henstridge",
         "James Henstridge",
         "1997-1999",
-        "<Image>/Python-Fu/Alchemy/_Clothify",
+        "<Image>/Filters/Alchemy/_Clothify...",
         "RGB*, GRAY*",
         [
                 (PF_INT, "x_blur", "X blur", 9),
Index: plug-ins/pygimp/plug-ins/foggify.py
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/pygimp/plug-ins/foggify.py,v
retrieving revision 1.12
diff -u -r1.12 foggify.py
--- plug-ins/pygimp/plug-ins/foggify.py	5 Mar 2005 08:48:45 -0000	1.12
+++ plug-ins/pygimp/plug-ins/foggify.py	7 Jun 2005 22:38:26 -0000
@@ -51,7 +51,7 @@
     "James Henstridge",
     "James Henstridge",
     "1999",
-    "<Image>/Python-Fu/Effects/Add _fog",
+    "<Image>/Filters/Render/Clouds/Add _fog...",
     "RGB*, GRAY*",
     [
         (PF_STRING, "name", "The new layer name", "Clouds"),
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.11
diff -u -r1.11 shadow_bevel.py
--- plug-ins/pygimp/plug-ins/shadow_bevel.py	3 Jun 2005 23:15:23 -0000	1.11
+++ plug-ins/pygimp/plug-ins/shadow_bevel.py	7 Jun 2005 22:38:26 -0000
@@ -60,7 +60,7 @@
     "James Henstridge",
     "James Henstridge",
     "1999",
-    "<Image>/Python-Fu/Effects/_Drop Shadow and Bevel",
+    "<Image>/Filters/Shadow/_Drop Shadow and Bevel...",
     "RGBA, GRAYA",
     [
         (PF_SLIDER, "blur",   "Shadow blur", 6, (1, 30, 1)),
Index: plug-ins/pygimp/plug-ins/whirlpinch.py
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/pygimp/plug-ins/whirlpinch.py,v
retrieving revision 1.7
diff -u -r1.7 whirlpinch.py
--- plug-ins/pygimp/plug-ins/whirlpinch.py	3 Jun 2005 23:15:23 -0000	1.7
+++ plug-ins/pygimp/plug-ins/whirlpinch.py	7 Jun 2005 22:38:26 -0000
@@ -203,7 +203,7 @@
         "James Henstridge (translated from C plugin)",
         "James Henstridge",
         "1997-1999",
-        "<Image>/Python-Fu/Distorts/_Whirl and Pinch",
+        "<Image>/Filters/Distorts/_Whirl and Pinch...",
         "RGB*, GRAY*",
         [
                 (PF_SLIDER, "whirl", "Whirl angle", 90, (-360, 360, 1)),
Index: plug-ins/script-fu/script-fu.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/script-fu.c,v
retrieving revision 1.80
diff -u -r1.80 script-fu.c
--- plug-ins/script-fu/script-fu.c	26 Mar 2005 22:28:17 -0000	1.80
+++ plug-ins/script-fu/script-fu.c	7 Jun 2005 22:38:26 -0000
@@ -292,25 +292,23 @@
   gimp_plugin_menu_branch_register ("<Toolbox>/Xtns/Script-Fu/Web Page Themes",
                                     N_("_Classic.Gimp.Org"));
 
-  gimp_plugin_menu_branch_register ("<Image>",
-                                    N_("S_cript-Fu"));
-  gimp_plugin_menu_branch_register ("<Image>/Script-Fu",
+  gimp_plugin_menu_branch_register ("<Image>/Filters",
                                     N_("_Alchemy"));
-  gimp_plugin_menu_branch_register ("<Image>/Script-Fu",
+  gimp_plugin_menu_branch_register ("<Image>/Filters",
                                     N_("Alpha to _Logo"));
-  gimp_plugin_menu_branch_register ("<Image>/Script-Fu",
+  gimp_plugin_menu_branch_register ("<Image>/Filters/Animation",
                                     N_("A_nimators"));
-  gimp_plugin_menu_branch_register ("<Image>/Script-Fu",
+  gimp_plugin_menu_branch_register ("<Image>/Filters",
                                     N_("_Decor"));
-  gimp_plugin_menu_branch_register ("<Image>/Script-Fu",
+  gimp_plugin_menu_branch_register ("<Image>/Filters",
                                     N_("_Render"));
-  gimp_plugin_menu_branch_register ("<Image>/Script-Fu",
+  gimp_plugin_menu_branch_register ("<Image>/Filters",
                                     N_("_Selection"));
-  gimp_plugin_menu_branch_register ("<Image>/Script-Fu",
+  gimp_plugin_menu_branch_register ("<Image>/Filters",
                                     N_("S_hadow"));
-  gimp_plugin_menu_branch_register ("<Image>/Script-Fu",
+  gimp_plugin_menu_branch_register ("<Image>/Filters/Decor",
                                     N_("Stencil _Ops"));
-  gimp_plugin_menu_branch_register ("<Image>/Script-Fu",
+  gimp_plugin_menu_branch_register ("<Image>/Filters",
                                     N_("_Utils"));
 
   gimp_install_temp_proc ("script_fu_refresh",
Index: plug-ins/script-fu/scripts/3d-outline.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/3d-outline.scm,v
retrieving revision 1.29
diff -u -r1.29 3d-outline.scm
--- plug-ins/script-fu/scripts/3d-outline.scm	24 Mar 2005 16:40:00 -0000	1.29
+++ plug-ins/script-fu/scripts/3d-outline.scm	7 Jun 2005 22:38:26 -0000
@@ -126,7 +126,7 @@
                     SF-ADJUSTMENT _"Shadow Y offset"     '(0 0 200 1 5 0 1))
 
 (script-fu-menu-register "script-fu-3d-outline-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-3d-outline-logo text-pattern
Index: plug-ins/script-fu/scripts/add-bevel.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/add-bevel.scm,v
retrieving revision 1.27
diff -u -r1.27 add-bevel.scm
--- plug-ins/script-fu/scripts/add-bevel.scm	24 Mar 2005 16:40:00 -0000	1.27
+++ plug-ins/script-fu/scripts/add-bevel.scm	7 Jun 2005 22:38:27 -0000
@@ -191,4 +191,4 @@
                     SF-TOGGLE     _"Keep bump layer" FALSE)
 
 (script-fu-menu-register "script-fu-add-bevel"
-			 "<Image>/Script-Fu/Decor")
+			 "<Image>/Filters/Decor")
Index: plug-ins/script-fu/scripts/addborder.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/addborder.scm,v
retrieving revision 1.22
diff -u -r1.22 addborder.scm
--- plug-ins/script-fu/scripts/addborder.scm	24 Mar 2005 16:40:00 -0000	1.22
+++ plug-ins/script-fu/scripts/addborder.scm	7 Jun 2005 22:38:27 -0000
@@ -180,4 +180,4 @@
                     SF-ADJUSTMENT _"Delta value on color" '(25 1 255 1 10 0 1))
 
 (script-fu-menu-register "script-fu-addborder"
-                         "<Image>/Script-Fu/Decor")
+                         "<Image>/Filters/Decor")
Index: plug-ins/script-fu/scripts/alien-glow-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/alien-glow-logo.scm,v
retrieving revision 1.26
diff -u -r1.26 alien-glow-logo.scm
--- plug-ins/script-fu/scripts/alien-glow-logo.scm	24 Mar 2005 16:40:00 -0000	1.26
+++ plug-ins/script-fu/scripts/alien-glow-logo.scm	7 Jun 2005 22:38:27 -0000
@@ -67,7 +67,7 @@
 		    SF-COLOR      _"Glow color"             '(63 252 0))
 
 (script-fu-menu-register "script-fu-alien-glow-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-alien-glow-logo text
Index: plug-ins/script-fu/scripts/alien-neon-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/alien-neon-logo.scm,v
retrieving revision 1.17
diff -u -r1.17 alien-neon-logo.scm
--- plug-ins/script-fu/scripts/alien-neon-logo.scm	24 Mar 2005 16:40:00 -0000	1.17
+++ plug-ins/script-fu/scripts/alien-neon-logo.scm	7 Jun 2005 22:38:27 -0000
@@ -132,7 +132,7 @@
 		    SF-TOGGLE     _"Fade away"        TRUE)
 
 (script-fu-menu-register "script-fu-alien-neon-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-alien-neon-logo text 
Index: plug-ins/script-fu/scripts/basic1-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/basic1-logo.scm,v
retrieving revision 1.25
diff -u -r1.25 basic1-logo.scm
--- plug-ins/script-fu/scripts/basic1-logo.scm	24 Mar 2005 16:40:00 -0000	1.25
+++ plug-ins/script-fu/scripts/basic1-logo.scm	7 Jun 2005 22:38:27 -0000
@@ -61,7 +61,7 @@
 		    SF-COLOR      _"Text color"       '(6 6 206))
 
 (script-fu-menu-register "script-fu-basic1-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-basic1-logo text
Index: plug-ins/script-fu/scripts/basic2-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/basic2-logo.scm,v
retrieving revision 1.26
diff -u -r1.26 basic2-logo.scm
--- plug-ins/script-fu/scripts/basic2-logo.scm	24 Mar 2005 16:40:00 -0000	1.26
+++ plug-ins/script-fu/scripts/basic2-logo.scm	7 Jun 2005 22:38:27 -0000
@@ -80,7 +80,7 @@
 		    SF-COLOR      _"Text color" '(206 6 50))
 
 (script-fu-menu-register "script-fu-basic2-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-basic2-logo text
Index: plug-ins/script-fu/scripts/blend-anim.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/blend-anim.scm,v
retrieving revision 1.16
diff -u -r1.16 blend-anim.scm
--- plug-ins/script-fu/scripts/blend-anim.scm	24 Mar 2005 16:40:00 -0000	1.16
+++ plug-ins/script-fu/scripts/blend-anim.scm	7 Jun 2005 22:38:27 -0000
@@ -231,4 +231,4 @@
 		    SF-TOGGLE     _"Looped"              TRUE)
 
 (script-fu-menu-register "script-fu-blend-anim"
-			 "<Image>/Script-Fu/Animators")
+			 "<Image>/Filters/Animation/Animators")
Index: plug-ins/script-fu/scripts/blended-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/blended-logo.scm,v
retrieving revision 1.32
diff -u -r1.32 blended-logo.scm
--- plug-ins/script-fu/scripts/blended-logo.scm	24 Mar 2005 16:40:00 -0000	1.32
+++ plug-ins/script-fu/scripts/blended-logo.scm	7 Jun 2005 22:38:28 -0000
@@ -135,7 +135,7 @@
 		    SF-TOGGLE     _"Gradient reverse" FALSE)
 
 (script-fu-menu-register "script-fu-blended-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-blended-logo text
Index: plug-ins/script-fu/scripts/bovinated-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/bovinated-logo.scm,v
retrieving revision 1.22
diff -u -r1.22 bovinated-logo.scm
--- plug-ins/script-fu/scripts/bovinated-logo.scm	24 Mar 2005 16:40:00 -0000	1.22
+++ plug-ins/script-fu/scripts/bovinated-logo.scm	7 Jun 2005 22:38:28 -0000
@@ -96,7 +96,7 @@
 		    SF-COLOR      _"Background Color" '(255 255 255))
 
 (script-fu-menu-register "script-fu-bovinated-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-bovinated-logo text
Index: plug-ins/script-fu/scripts/burn-in-anim.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/burn-in-anim.scm,v
retrieving revision 1.20
diff -u -r1.20 burn-in-anim.scm
--- plug-ins/script-fu/scripts/burn-in-anim.scm	24 Mar 2005 16:40:00 -0000	1.20
+++ plug-ins/script-fu/scripts/burn-in-anim.scm	7 Jun 2005 22:38:28 -0000
@@ -201,4 +201,4 @@
 		    SF-VALUE    _"Speed (pixels/frame)" "50")
 
 (script-fu-menu-register "script-fu-burn-in-anim"
-			 "<Image>/Script-Fu/Animators")
+			 "<Image>/Filters/Animation/Animators")
Index: plug-ins/script-fu/scripts/carve-it.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/carve-it.scm,v
retrieving revision 1.22
diff -u -r1.22 carve-it.scm
--- plug-ins/script-fu/scripts/carve-it.scm	24 Mar 2005 16:40:00 -0000	1.22
+++ plug-ins/script-fu/scripts/carve-it.scm	7 Jun 2005 22:38:28 -0000
@@ -186,4 +186,4 @@
 		    SF-TOGGLE   _"Carve white areas" TRUE)
 
 (script-fu-menu-register "script-fu-carve-it"
-			 "<Image>/Script-Fu/Stencil Ops")
+			 "<Image>/Filters/Decor/Stencil Ops")
Index: plug-ins/script-fu/scripts/chalk.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/chalk.scm,v
retrieving revision 1.22
diff -u -r1.22 chalk.scm
--- plug-ins/script-fu/scripts/chalk.scm	24 Mar 2005 16:40:00 -0000	1.22
+++ plug-ins/script-fu/scripts/chalk.scm	7 Jun 2005 22:38:28 -0000
@@ -77,7 +77,7 @@
                     SF-COLOR    _"Background color" '(0 0 0))
 
 (script-fu-menu-register "script-fu-chalk-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-chalk-logo text
Index: plug-ins/script-fu/scripts/chip-away.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/chip-away.scm,v
retrieving revision 1.27
diff -u -r1.27 chip-away.scm
--- plug-ins/script-fu/scripts/chip-away.scm	24 Mar 2005 16:40:00 -0000	1.27
+++ plug-ins/script-fu/scripts/chip-away.scm	7 Jun 2005 22:38:28 -0000
@@ -145,7 +145,7 @@
 		    SF-PATTERN    _"Pattern"              "Burlwood")
 
 (script-fu-menu-register "script-fu-chip-away-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-chip-away-logo text
Index: plug-ins/script-fu/scripts/chrome-it.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/chrome-it.scm,v
retrieving revision 1.26
diff -u -r1.26 chrome-it.scm
--- plug-ins/script-fu/scripts/chrome-it.scm	24 Mar 2005 16:40:00 -0000	1.26
+++ plug-ins/script-fu/scripts/chrome-it.scm	7 Jun 2005 22:38:28 -0000
@@ -199,4 +199,4 @@
 		    SF-TOGGLE     _"Chrome white areas" TRUE)
 
 (script-fu-menu-register "script-fu-sota-chrome-it"
-			 "<Image>/Script-Fu/Stencil Ops")
+			 "<Image>/Filters/Decor/Stencil Ops")
Index: plug-ins/script-fu/scripts/chrome-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/chrome-logo.scm,v
retrieving revision 1.23
diff -u -r1.23 chrome-logo.scm
--- plug-ins/script-fu/scripts/chrome-logo.scm	24 Mar 2005 16:40:00 -0000	1.23
+++ plug-ins/script-fu/scripts/chrome-logo.scm	7 Jun 2005 22:38:29 -0000
@@ -87,7 +87,7 @@
 		    SF-COLOR      _"Background Color"     '(191 191 191))
 
 (script-fu-menu-register "script-fu-chrome-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-chrome-logo text
Index: plug-ins/script-fu/scripts/circuit.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/circuit.scm,v
retrieving revision 1.25
diff -u -r1.25 circuit.scm
--- plug-ins/script-fu/scripts/circuit.scm	24 Mar 2005 16:40:00 -0000	1.25
+++ plug-ins/script-fu/scripts/circuit.scm	7 Jun 2005 22:38:29 -0000
@@ -143,4 +143,4 @@
 		    SF-TOGGLE     _"Separate layer"   TRUE)
 
 (script-fu-menu-register "script-fu-circuit"
-			 "<Image>/Script-Fu/Render")
+			 "<Image>/Filters/Render")
Index: plug-ins/script-fu/scripts/clothify.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/clothify.scm,v
retrieving revision 1.18
diff -u -r1.18 clothify.scm
--- plug-ins/script-fu/scripts/clothify.scm	24 Mar 2005 16:40:00 -0000	1.18
+++ plug-ins/script-fu/scripts/clothify.scm	7 Jun 2005 22:38:29 -0000
@@ -60,4 +60,4 @@
 		    SF-ADJUSTMENT _"Depth"          '(3 1 50 1 10 0 1))
 
 (script-fu-menu-register "script-fu-clothify"
-			 "<Image>/Script-Fu/Alchemy")
+			 "<Image>/Filters/Alchemy")
Index: plug-ins/script-fu/scripts/coffee.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/coffee.scm,v
retrieving revision 1.23
diff -u -r1.23 coffee.scm
--- plug-ins/script-fu/scripts/coffee.scm	24 Mar 2005 16:40:00 -0000	1.23
+++ plug-ins/script-fu/scripts/coffee.scm	7 Jun 2005 22:38:29 -0000
@@ -86,4 +86,4 @@
 		    SF-TOGGLE     _"Darken only\n(Better, but only for images with alot of white)" TRUE)
 
 (script-fu-menu-register "script-fu-coffee-stain"
-			 "<Image>/Script-Fu/Decor")
+			 "<Image>/Filters/Decor")
Index: plug-ins/script-fu/scripts/comic-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/comic-logo.scm,v
retrieving revision 1.34
diff -u -r1.34 comic-logo.scm
--- plug-ins/script-fu/scripts/comic-logo.scm	24 Mar 2005 16:40:00 -0000	1.34
+++ plug-ins/script-fu/scripts/comic-logo.scm	7 Jun 2005 22:38:29 -0000
@@ -121,7 +121,7 @@
 		    SF-COLOR      _"Background color" '(255 255 255))
 
 (script-fu-menu-register "script-fu-comic-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-comic-logo text
Index: plug-ins/script-fu/scripts/coolmetal-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/coolmetal-logo.scm,v
retrieving revision 1.34
diff -u -r1.34 coolmetal-logo.scm
--- plug-ins/script-fu/scripts/coolmetal-logo.scm	24 Mar 2005 16:40:00 -0000	1.34
+++ plug-ins/script-fu/scripts/coolmetal-logo.scm	7 Jun 2005 22:38:29 -0000
@@ -136,7 +136,7 @@
 		    SF-TOGGLE     _"Gradient reverse"     FALSE)
 
 (script-fu-menu-register "script-fu-cool-metal-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-cool-metal-logo text
Index: plug-ins/script-fu/scripts/distress-selection.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/distress-selection.scm,v
retrieving revision 1.16
diff -u -r1.16 distress-selection.scm
--- plug-ins/script-fu/scripts/distress-selection.scm	24 Mar 2005 16:40:00 -0000	1.16
+++ plug-ins/script-fu/scripts/distress-selection.scm	7 Jun 2005 22:38:29 -0000
@@ -99,4 +99,4 @@
 		    SF-TOGGLE     _"Smooth vertically"      TRUE)
 
 (script-fu-menu-register "script-fu-distress-selection"
-			 "<Image>/Script-Fu/Selection")
+			 "<Image>/Filters/Selection")
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.20
diff -u -r1.20 drop-shadow.scm
--- plug-ins/script-fu/scripts/drop-shadow.scm	24 Mar 2005 16:40:00 -0000	1.20
+++ plug-ins/script-fu/scripts/drop-shadow.scm	7 Jun 2005 22:38:29 -0000
@@ -175,4 +175,4 @@
 		    SF-TOGGLE     _"Allow resizing" TRUE)
 
 (script-fu-menu-register "script-fu-drop-shadow"
-			 "<Image>/Script-Fu/Shadow")
+			 "<Image>/Filters/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.18
diff -u -r1.18 erase-rows.scm
--- plug-ins/script-fu/scripts/erase-rows.scm	24 Mar 2005 16:40:00 -0000	1.18
+++ plug-ins/script-fu/scripts/erase-rows.scm	7 Jun 2005 22:38:29 -0000
@@ -38,4 +38,4 @@
 		    SF-OPTION   _"Erase/fill" '(_"Erase" _"Fill with BG"))
 
 (script-fu-menu-register "script-fu-erase-rows"
-			 "<Image>/Script-Fu/Alchemy")
+			 "<Image>/Filters/Alchemy")
Index: plug-ins/script-fu/scripts/fade-outline.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/fade-outline.scm,v
retrieving revision 1.19
diff -u -r1.19 fade-outline.scm
--- plug-ins/script-fu/scripts/fade-outline.scm	24 Mar 2005 16:40:00 -0000	1.19
+++ plug-ins/script-fu/scripts/fade-outline.scm	7 Jun 2005 22:38:29 -0000
@@ -170,4 +170,4 @@
 		    SF-TOGGLE     _"Clear unselected maskarea" TRUE)
 
 (script-fu-menu-register "script-fu-fade-outline"
-			 "<Image>/Script-Fu/Selection")
+			 "<Image>/Filters/Selection")
Index: plug-ins/script-fu/scripts/frosty-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/frosty-logo.scm,v
retrieving revision 1.29
diff -u -r1.29 frosty-logo.scm
--- plug-ins/script-fu/scripts/frosty-logo.scm	24 Mar 2005 16:40:00 -0000	1.29
+++ plug-ins/script-fu/scripts/frosty-logo.scm	7 Jun 2005 22:38:30 -0000
@@ -106,7 +106,7 @@
 		    SF-COLOR      _"Background color"     '(255 255 255))
 
 (script-fu-menu-register "script-fu-frosty-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 (define (script-fu-frosty-logo text
 			       size
Index: plug-ins/script-fu/scripts/fuzzyborder.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/fuzzyborder.scm,v
retrieving revision 1.16
diff -u -r1.16 fuzzyborder.scm
--- plug-ins/script-fu/scripts/fuzzyborder.scm	24 Mar 2005 16:40:00 -0000	1.16
+++ plug-ins/script-fu/scripts/fuzzyborder.scm	7 Jun 2005 22:38:30 -0000
@@ -163,4 +163,4 @@
 		    SF-TOGGLE     _"Flatten image"          TRUE)
 
 (script-fu-menu-register "script-fu-fuzzy-border"
-			 "<Image>/Script-Fu/Decor")
+			 "<Image>/Filters/Decor")
Index: plug-ins/script-fu/scripts/glossy.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/glossy.scm,v
retrieving revision 1.36
diff -u -r1.36 glossy.scm
--- plug-ins/script-fu/scripts/glossy.scm	24 Mar 2005 16:40:00 -0000	1.36
+++ plug-ins/script-fu/scripts/glossy.scm	7 Jun 2005 22:38:30 -0000
@@ -199,7 +199,7 @@
                     SF-ADJUSTMENT _"Shadow Y offset"          '(8 0 100 1 10 0 1))
 
 (script-fu-menu-register "script-fu-glossy-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-glossy-logo text
Index: plug-ins/script-fu/scripts/glowing-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/glowing-logo.scm,v
retrieving revision 1.21
diff -u -r1.21 glowing-logo.scm
--- plug-ins/script-fu/scripts/glowing-logo.scm	24 Mar 2005 16:40:00 -0000	1.21
+++ plug-ins/script-fu/scripts/glowing-logo.scm	7 Jun 2005 22:38:30 -0000
@@ -79,7 +79,7 @@
 		    SF-COLOR      _"Background color"         '(7 0 20))
 
 (script-fu-menu-register "script-fu-glowing-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-glowing-logo text
Index: plug-ins/script-fu/scripts/gradient-bevel-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/gradient-bevel-logo.scm,v
retrieving revision 1.28
diff -u -r1.28 gradient-bevel-logo.scm
--- plug-ins/script-fu/scripts/gradient-bevel-logo.scm	24 Mar 2005 16:40:00 -0000	1.28
+++ plug-ins/script-fu/scripts/gradient-bevel-logo.scm	7 Jun 2005 22:38:30 -0000
@@ -102,7 +102,7 @@
 		    SF-COLOR      _"Background color"         '(255 255 255))
 
 (script-fu-menu-register "script-fu-gradient-bevel-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-gradient-bevel-logo text
Index: plug-ins/script-fu/scripts/grid-system.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/grid-system.scm,v
retrieving revision 1.14
diff -u -r1.14 grid-system.scm
--- plug-ins/script-fu/scripts/grid-system.scm	24 Mar 2005 16:40:00 -0000	1.14
+++ plug-ins/script-fu/scripts/grid-system.scm	7 Jun 2005 22:38:30 -0000
@@ -95,4 +95,4 @@
 		    SF-VALUE    _"Y divisions" script-fu-grid-system-y-divides)
 
 (script-fu-menu-register "script-fu-grid-system"
-			 "<Image>/Script-Fu/Render")
+			 "<Image>/Filters/Render")
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.23
diff -u -r1.23 hsv-graph.scm
--- plug-ins/script-fu/scripts/hsv-graph.scm	24 Mar 2005 16:40:00 -0000	1.23
+++ plug-ins/script-fu/scripts/hsv-graph.scm	7 Jun 2005 22:38:31 -0000
@@ -349,4 +349,4 @@
 		    SF-ADJUSTMENT _"End Y" (cons script-fu-hsv-graph-end-y '(0 5000 1 10 0 1)))
 
 (script-fu-menu-register "script-fu-hsv-graph"
-			 "<Image>/Script-Fu/Utils")
+			 "<Image>/Filters/Colors")
Index: plug-ins/script-fu/scripts/image-structure.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/image-structure.scm,v
retrieving revision 1.23
diff -u -r1.23 image-structure.scm
--- plug-ins/script-fu/scripts/image-structure.scm	24 Mar 2005 16:40:00 -0000	1.23
+++ plug-ins/script-fu/scripts/image-structure.scm	7 Jun 2005 22:38:31 -0000
@@ -161,4 +161,4 @@
 		    SF-COLOR      _"Background color" script-fu-show-image-structure-background-color)
 
 (script-fu-menu-register "script-fu-show-image-structure"
-			 "<Image>/Script-Fu/Utils")
+			 "<Image>/Image")
Index: plug-ins/script-fu/scripts/lava.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/lava.scm,v
retrieving revision 1.24
diff -u -r1.24 lava.scm
--- plug-ins/script-fu/scripts/lava.scm	24 Mar 2005 16:40:00 -0000	1.24
+++ plug-ins/script-fu/scripts/lava.scm	7 Jun 2005 22:38:31 -0000
@@ -115,4 +115,4 @@
 		    SF-TOGGLE     _"Use current gradient" FALSE)
 
 (script-fu-menu-register "script-fu-lava"
-			 "<Image>/Script-Fu/Render")
+			 "<Image>/Filters/Render")
Index: plug-ins/script-fu/scripts/line-nova.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/line-nova.scm,v
retrieving revision 1.15
diff -u -r1.15 line-nova.scm
--- plug-ins/script-fu/scripts/line-nova.scm	24 Mar 2005 16:40:00 -0000	1.15
+++ plug-ins/script-fu/scripts/line-nova.scm	7 Jun 2005 22:38:31 -0000
@@ -84,4 +84,4 @@
 		    SF-ADJUSTMENT _"Randomness"          '(30 0 2000 1 1 0 1))
 
 (script-fu-menu-register "script-fu-line-nova"
-			 "<Image>/Script-Fu/Render")
+			 "<Image>/Filters/Render")
Index: plug-ins/script-fu/scripts/neon-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/neon-logo.scm,v
retrieving revision 1.25
diff -u -r1.25 neon-logo.scm
--- plug-ins/script-fu/scripts/neon-logo.scm	24 Mar 2005 16:40:00 -0000	1.25
+++ plug-ins/script-fu/scripts/neon-logo.scm	7 Jun 2005 22:38:31 -0000
@@ -190,7 +190,7 @@
 		    SF-TOGGLE     _"Create shadow"    FALSE)
 
 (script-fu-menu-register "script-fu-neon-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-neon-logo text
Index: plug-ins/script-fu/scripts/old-photo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/old-photo.scm,v
retrieving revision 1.16
diff -u -r1.16 old-photo.scm
--- plug-ins/script-fu/scripts/old-photo.scm	24 Mar 2005 16:40:00 -0000	1.16
+++ plug-ins/script-fu/scripts/old-photo.scm	7 Jun 2005 22:38:31 -0000
@@ -99,4 +99,4 @@
 		    SF-TOGGLE     _"Work on copy" TRUE)
 
 (script-fu-menu-register "script-fu-old-photo"
-			 "<Image>/Script-Fu/Decor")
+			 "<Image>/Filters/Decor")
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.25
diff -u -r1.25 perspective-shadow.scm
--- plug-ins/script-fu/scripts/perspective-shadow.scm	24 Mar 2005 16:40:00 -0000	1.25
+++ plug-ins/script-fu/scripts/perspective-shadow.scm	7 Jun 2005 22:38:31 -0000
@@ -193,4 +193,4 @@
 		    SF-TOGGLE     _"Allow resizing" FALSE)
 
 (script-fu-menu-register "script-fu-perspective-shadow"
-			 "<Image>/Script-Fu/Shadow")
+			 "<Image>/Filters/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.21
diff -u -r1.21 predator.scm
--- plug-ins/script-fu/scripts/predator.scm	24 Mar 2005 16:40:00 -0000	1.21
+++ plug-ins/script-fu/scripts/predator.scm	7 Jun 2005 22:38:32 -0000
@@ -122,4 +122,4 @@
 		    SF-TOGGLE     _"Separate layer" TRUE)
 
 (script-fu-menu-register "script-fu-predator"
-			 "<Image>/Script-Fu/Alchemy")
+			 "<Image>/Filters/Alchemy")
Index: plug-ins/script-fu/scripts/ripply-anim.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/ripply-anim.scm,v
retrieving revision 1.27
diff -u -r1.27 ripply-anim.scm
--- plug-ins/script-fu/scripts/ripply-anim.scm	24 Mar 2005 16:40:00 -0000	1.27
+++ plug-ins/script-fu/scripts/ripply-anim.scm	7 Jun 2005 22:38:32 -0000
@@ -125,4 +125,4 @@
 							   _"Black"))
 
 (script-fu-menu-register "script-fu-ripply-anim"
-			 "<Image>/Script-Fu/Animators")
+			 "<Image>/Filters/Animation/Animators")
Index: plug-ins/script-fu/scripts/round-corners.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/round-corners.scm,v
retrieving revision 1.17
diff -u -r1.17 round-corners.scm
--- plug-ins/script-fu/scripts/round-corners.scm	24 Mar 2005 16:40:00 -0000	1.17
+++ plug-ins/script-fu/scripts/round-corners.scm	7 Jun 2005 22:38:32 -0000
@@ -139,4 +139,4 @@
 		    SF-TOGGLE     _"Work on copy"    TRUE)
 
 (script-fu-menu-register "script-fu-round-corners"
-			 "<Image>/Script-Fu/Decor")
+			 "<Image>/Filters/Decor")
Index: plug-ins/script-fu/scripts/select-to-brush.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/select-to-brush.scm,v
retrieving revision 1.22
diff -u -r1.22 select-to-brush.scm
--- plug-ins/script-fu/scripts/select-to-brush.scm	24 Mar 2005 16:40:00 -0000	1.22
+++ plug-ins/script-fu/scripts/select-to-brush.scm	7 Jun 2005 22:38:32 -0000
@@ -125,4 +125,4 @@
 		    SF-ADJUSTMENT _"Spacing"     '(25 0 1000 1 1 1 0))
 
 (script-fu-menu-register "script-fu-selection-to-brush"
-			 "<Image>/Script-Fu/Selection")
+			 "<Image>/Filters/Selection")
Index: plug-ins/script-fu/scripts/select-to-image.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/select-to-image.scm,v
retrieving revision 1.16
diff -u -r1.16 select-to-image.scm
--- plug-ins/script-fu/scripts/select-to-image.scm	24 Mar 2005 16:40:00 -0000	1.16
+++ plug-ins/script-fu/scripts/select-to-image.scm	7 Jun 2005 22:38:32 -0000
@@ -76,4 +76,4 @@
 		    SF-DRAWABLE "Drawable" 0)
 
 (script-fu-menu-register "script-fu-selection-to-image"
-			 "<Image>/Script-Fu/Selection")
+			 "<Image>/Filters/Selection")
Index: plug-ins/script-fu/scripts/select-to-pattern.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/select-to-pattern.scm,v
retrieving revision 1.9
diff -u -r1.9 select-to-pattern.scm
--- plug-ins/script-fu/scripts/select-to-pattern.scm	24 Mar 2005 16:40:00 -0000	1.9
+++ plug-ins/script-fu/scripts/select-to-pattern.scm	7 Jun 2005 22:38:32 -0000
@@ -84,4 +84,4 @@
 		    SF-STRING   _"Filename"     "mypattern")
 
 (script-fu-menu-register "script-fu-selection-to-pattern"
-			 "<Image>/Script-Fu/Selection")
+			 "<Image>/Filters/Selection")
Index: plug-ins/script-fu/scripts/slide.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/slide.scm,v
retrieving revision 1.27
diff -u -r1.27 slide.scm
--- plug-ins/script-fu/scripts/slide.scm	24 Mar 2005 16:40:00 -0000	1.27
+++ plug-ins/script-fu/scripts/slide.scm	7 Jun 2005 22:38:32 -0000
@@ -244,4 +244,4 @@
 		    SF-TOGGLE   _"Work on copy" TRUE)
 
 (script-fu-menu-register "script-fu-slide"
-			 "<Image>/Script-Fu/Decor")
+			 "<Image>/Filters/Decor")
Index: plug-ins/script-fu/scripts/spinning-globe.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/spinning-globe.scm,v
retrieving revision 1.19
diff -u -r1.19 spinning-globe.scm
--- plug-ins/script-fu/scripts/spinning-globe.scm	24 Mar 2005 16:40:00 -0000	1.19
+++ plug-ins/script-fu/scripts/spinning-globe.scm	7 Jun 2005 22:38:32 -0000
@@ -120,4 +120,4 @@
 		    SF-TOGGLE     _"Work on copy"            TRUE)
 
 (script-fu-menu-register "script-fu-spinning-globe"
-			 "<Image>/Script-Fu/Animators")
+			 "<Image>/Filters/Animation/Animators")
Index: plug-ins/script-fu/scripts/spyrogimp.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/spyrogimp.scm,v
retrieving revision 1.14
diff -u -r1.14 spyrogimp.scm
--- plug-ins/script-fu/scripts/spyrogimp.scm	24 Mar 2005 16:40:00 -0000	1.14
+++ plug-ins/script-fu/scripts/spyrogimp.scm	7 Jun 2005 22:38:33 -0000
@@ -361,4 +361,4 @@
                     SF-GRADIENT   _"Gradient"       "Deep Sea")
 
 (script-fu-menu-register "script-fu-spyrogimp"
-                         "<Image>/Script-Fu/Render")
+                         "<Image>/Filters/Render")
Index: plug-ins/script-fu/scripts/starburst-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/starburst-logo.scm,v
retrieving revision 1.26
diff -u -r1.26 starburst-logo.scm
--- plug-ins/script-fu/scripts/starburst-logo.scm	24 Mar 2005 16:40:00 -0000	1.26
+++ plug-ins/script-fu/scripts/starburst-logo.scm	7 Jun 2005 22:38:33 -0000
@@ -86,7 +86,7 @@
 		    SF-COLOR      _"Background color" '(255 255 255))
 
 (script-fu-menu-register "script-fu-starburst-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-starburst-logo text size fontname burst-color bg-color)
Index: plug-ins/script-fu/scripts/starscape-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/starscape-logo.scm,v
retrieving revision 1.29
diff -u -r1.29 starscape-logo.scm
--- plug-ins/script-fu/scripts/starscape-logo.scm	24 Mar 2005 16:40:00 -0000	1.29
+++ plug-ins/script-fu/scripts/starscape-logo.scm	7 Jun 2005 22:38:33 -0000
@@ -134,7 +134,7 @@
 		    SF-COLOR      _"Glow color"               '(28 65 188))
 
 (script-fu-menu-register "script-fu-starscape-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-starscape-logo text
Index: plug-ins/script-fu/scripts/t-o-p-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/t-o-p-logo.scm,v
retrieving revision 1.26
diff -u -r1.26 t-o-p-logo.scm
--- plug-ins/script-fu/scripts/t-o-p-logo.scm	24 Mar 2005 16:40:00 -0000	1.26
+++ plug-ins/script-fu/scripts/t-o-p-logo.scm	7 Jun 2005 22:38:33 -0000
@@ -108,7 +108,7 @@
 		    SF-COLOR      _"Background color"     '(255 255 255))
 
 (script-fu-menu-register "script-fu-t-o-p-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-t-o-p-logo text
Index: plug-ins/script-fu/scripts/textured-logo.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/textured-logo.scm,v
retrieving revision 1.35
diff -u -r1.35 textured-logo.scm
--- plug-ins/script-fu/scripts/textured-logo.scm	24 Mar 2005 16:40:00 -0000	1.35
+++ plug-ins/script-fu/scripts/textured-logo.scm	7 Jun 2005 22:38:33 -0000
@@ -129,7 +129,7 @@
 		    SF-COLOR      _"Ending blend"         '(0 0 106))
 
 (script-fu-menu-register "script-fu-textured-logo-alpha"
-			 "<Image>/Script-Fu/Alpha to Logo")
+			 "<Image>/Filters/Alpha to Logo")
 
 
 (define (script-fu-textured-logo text
Index: plug-ins/script-fu/scripts/unsharp-mask.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/unsharp-mask.scm,v
retrieving revision 1.16
diff -u -r1.16 unsharp-mask.scm
--- plug-ins/script-fu/scripts/unsharp-mask.scm	24 Mar 2005 16:40:00 -0000	1.16
+++ plug-ins/script-fu/scripts/unsharp-mask.scm	7 Jun 2005 22:38:33 -0000
@@ -68,7 +68,7 @@
 
 
 (script-fu-register "script-fu-unsharp-mask"
-		    _"_Unsharp Mask..."
+		    _"Unsharp Mask 2..."
 		    "Make a sharp image of IMAGE's DRAWABLE by applying unsharp mask method"
 		    "Shuji Narazaki <narazaki@gimp.org>"
 		    "Shuji Narazaki"
@@ -80,4 +80,4 @@
 		    SF-ADJUSTMENT _"Mask opacity"      '(50 0 100 1 1 0 1))
 
 (script-fu-menu-register "script-fu-unsharp-mask"
-			 "<Image>/Script-Fu/Alchemy")
+			 "<Image>/Filters/Enhance")
Index: plug-ins/script-fu/scripts/waves-anim.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/waves-anim.scm,v
retrieving revision 1.18
diff -u -r1.18 waves-anim.scm
--- plug-ins/script-fu/scripts/waves-anim.scm	24 Mar 2005 16:40:00 -0000	1.18
+++ plug-ins/script-fu/scripts/waves-anim.scm	7 Jun 2005 22:38:33 -0000
@@ -101,4 +101,4 @@
 		    SF-TOGGLE     _"Invert direction" FALSE)
 
 (script-fu-menu-register "script-fu-waves-anim"
-			 "<Image>/Script-Fu/Animators")
+			 "<Image>/Filters/Animation/Animators")
Index: plug-ins/script-fu/scripts/weave.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/weave.scm,v
retrieving revision 1.24
diff -u -r1.24 weave.scm
--- plug-ins/script-fu/scripts/weave.scm	24 Mar 2005 16:40:00 -0000	1.24
+++ plug-ins/script-fu/scripts/weave.scm	7 Jun 2005 22:38:34 -0000
@@ -403,4 +403,4 @@
 		    SF-ADJUSTMENT _"Thread intensity"  '(100 0 100 1 10 1 1))
 
 (script-fu-menu-register "script-fu-weave"
-			 "<Image>/Script-Fu/Alchemy")
+			 "<Image>/Filters/Alchemy")
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.23
diff -u -r1.23 xach-effect.scm
--- plug-ins/script-fu/scripts/xach-effect.scm	24 Mar 2005 16:40:00 -0000	1.23
+++ plug-ins/script-fu/scripts/xach-effect.scm	7 Jun 2005 22:38:34 -0000
@@ -131,4 +131,4 @@
 		    SF-TOGGLE     _"Keep selection"       TRUE)
 
 (script-fu-menu-register "script-fu-xach-effect"
-			 "<Image>/Script-Fu/Shadow")
+			 "<Image>/Filters/Shadow")
