Index: scripts/3dTruchet.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/3dTruchet.scm,v
retrieving revision 1.22
diff -p -u -r1.22 3dTruchet.scm
--- scripts/3dTruchet.scm	22 Sep 2004 18:43:09 -0000	1.22
+++ scripts/3dTruchet.scm	11 Oct 2004 01:01:57 -0000
@@ -210,7 +210,7 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-3dtruchet"
-		    _"<Toolbox>/Xtns/Script-Fu/Patterns/3_D Truchet..."
+		    _"<Toolbox>/Xtns/Render/Patterns/3_D Truchet..."
 		    "3D Truchet pattern"
 		    "Adrian Likins <aklikins@eos.ncsu.edu>"
 		    "Adrian Likins"
Index: scripts/alien-glow-arrow.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/alien-glow-arrow.scm,v
retrieving revision 1.22
diff -p -u -r1.22 alien-glow-arrow.scm
--- scripts/alien-glow-arrow.scm	22 Sep 2004 18:43:09 -0000	1.22
+++ scripts/alien-glow-arrow.scm	11 Oct 2004 01:01:57 -0000
@@ -144,8 +144,8 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-alien-glow-right-arrow"
-                    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Alien Glow/_Arrow..."
-                    "Create an X-file deal"
+                    _"<Toolbox>/Xtns/Render/Themes/Web/Alien Glow/_Arrow..."
+                    "Create an X-file deal."
                     "Adrian Likins"
                     "Adrian Likins"
                     "1997"
Index: scripts/alien-glow-bar.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/alien-glow-bar.scm,v
retrieving revision 1.18
diff -p -u -r1.18 alien-glow-bar.scm
--- scripts/alien-glow-bar.scm	22 Sep 2004 18:43:09 -0000	1.18
+++ scripts/alien-glow-bar.scm	11 Oct 2004 01:01:57 -0000
@@ -82,7 +82,7 @@
 
 
 (script-fu-register "script-fu-alien-glow-horizontal-ruler"
-		    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Alien Glow/_Hrule..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Alien Glow/_Hrule..."
 		    "Create an Hrule with the Alien Glow look"
 		    "Adrian Likins"
 		    "Adrian Likins"
Index: scripts/alien-glow-bullet.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/alien-glow-bullet.scm,v
retrieving revision 1.19
diff -p -u -r1.19 alien-glow-bullet.scm
--- scripts/alien-glow-bullet.scm	22 Sep 2004 18:43:09 -0000	1.19
+++ scripts/alien-glow-bullet.scm	11 Oct 2004 01:01:57 -0000
@@ -93,7 +93,7 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-alien-glow-bullet"
-		    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Alien Glow/_Bullet..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Alien Glow/_Bullet..."
 		    "Create a Bullet with an Alien Glow theme for web pages"
 		    "Adrian Likins"
 		    "Adrian Likins"
Index: scripts/alien-glow-button.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/alien-glow-button.scm,v
retrieving revision 1.22
diff -p -u -r1.22 alien-glow-button.scm
--- scripts/alien-glow-button.scm	22 Sep 2004 18:43:09 -0000	1.22
+++ scripts/alien-glow-button.scm	11 Oct 2004 01:01:57 -0000
@@ -137,7 +137,7 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-alien-glow-button"
-		    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Alien Glow/B_utton..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Alien Glow/B_utton..."
 		    "Button with an eerie glow"
 		    "Adrian Likins"
 		    "Adrian Likins"
Index: scripts/asc2img.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/asc2img.scm,v
retrieving revision 1.19
diff -p -u -r1.19 asc2img.scm
--- scripts/asc2img.scm	4 Oct 2004 09:02:00 -0000	1.19
+++ scripts/asc2img.scm	11 Oct 2004 01:01:57 -0000
@@ -223,7 +223,7 @@
 
 (script-fu-register
     "script-fu-asc-2-img"
-    _"<Toolbox>/Xtns/Script-Fu/Utils/_ASCII to Image..."
+    _"<Toolbox>/Xtns/Utility/_ASCII to Image..."
     "Create a new image containing text from a simple text file"
     "Chris Gutteridge: cjg@ecs.soton.ac.uk"
     "8th April 1998"
@@ -239,7 +239,7 @@
 )
 
 (script-fu-register "tiny-fu-asc-2-img-layer"
-    _"<Image>/Script-Fu/Utils/_ASCII to Layer..."
+    _"<Image>/Xtns/Utility/_ASCII to Layer..."
     "Create a new layer of text from a simple text file"
     "Chris Gutteridge: cjg@ecs.soton.ac.uk"
     "30th April 1998"
Index: scripts/beveled-button.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/beveled-button.scm,v
retrieving revision 1.22
diff -p -u -r1.22 beveled-button.scm
--- scripts/beveled-button.scm	22 Sep 2004 18:43:09 -0000	1.22
+++ scripts/beveled-button.scm	11 Oct 2004 01:01:57 -0000
@@ -24,6 +24,11 @@
 ; All calls to gimp-text-* have been converted to use the *-fontname form.
 ; The corresponding parameters have been replaced by an SF-FONT parameter.
 ; ************************************************************************
+; Changed on Oct 9, 2004 by Carol Spears <carol@gimp.org>
+; For use with GIMP 2.1.
+; Moved menu location from Xtns/Script-Fu/Buttons/Simple _Beveled Button... to 
+; Xtns/Render/Themes/Web/Buttons/Simple _Beveled Button...
+; ************************************************************************
 
 
 (define (text-width extents)
@@ -136,7 +141,7 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-button00"
-		    _"<Toolbox>/Xtns/Script-Fu/Buttons/Simple _Beveled Button..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Buttons/Simple _Beveled Button..."
 		    "Simple beveled button"
 		    "Federico Mena Quintero"
 		    "Federico Mena Quintero"
Index: scripts/beveled-pattern-arrow.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/beveled-pattern-arrow.scm,v
retrieving revision 1.18
diff -p -u -r1.18 beveled-pattern-arrow.scm
--- scripts/beveled-pattern-arrow.scm	23 Sep 2004 11:44:32 -0000	1.18
+++ scripts/beveled-pattern-arrow.scm	11 Oct 2004 01:01:57 -0000
@@ -18,6 +18,12 @@
 ; You should have received a copy of the GNU General Public License
 ; along with this program; if not, write to the Free Software
 ; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+; ************************************************************************
+; Changed on Oct 9, 2004 by Carol Spears <carol@gimp.org>
+; For use with GIMP 2.1.
+; Moved menu location from Xtns/Script-Fu/Web Page Themes/Beveled Pattern/_Arrow... to 
+; Xtns/Render/Themes/Web/Beveled Pattern/_Arrow...
+; ************************************************************************
 
 
 (define (script-fu-beveled-pattern-arrow size orientation pattern)
@@ -140,7 +146,7 @@
 
 
 (script-fu-register "script-fu-beveled-pattern-arrow"
-                    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Beveled Pattern/_Arrow..."
+                    _"<Toolbox>/Xtns/Render/Themes/Web/Beveled Pattern/_Arrow..."
                     "Beveled pattern arrow"
                     "Federico Mena Quintero"
                     "Federico Mena Quintero"
Index: scripts/beveled-pattern-bullet.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/beveled-pattern-bullet.scm,v
retrieving revision 1.17
diff -p -u -r1.17 beveled-pattern-bullet.scm
--- scripts/beveled-pattern-bullet.scm	23 Sep 2004 11:44:32 -0000	1.17
+++ scripts/beveled-pattern-bullet.scm	11 Oct 2004 01:01:57 -0000
@@ -18,6 +18,12 @@
 ; You should have received a copy of the GNU General Public License
 ; along with this program; if not, write to the Free Software
 ; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+; ************************************************************************
+; Changed on Oct 9, 2004 by Carol Spears <carol@gimp.org>
+; For use with GIMP 2.1.
+; Moved menu location from Xtns/Script-Fu/Web Page Themes/Beveled Pattern/_Bullet... to 
+; Xtns/Render/Themes/Web/Beveled Pattern/_Bullet...
+; ************************************************************************
 
 
 (define (script-fu-beveled-pattern-bullet diameter pattern transparent)
@@ -77,7 +83,7 @@
 
 
 (script-fu-register "script-fu-beveled-pattern-bullet"
-		    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Beveled Pattern/_Bullet..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Beveled Pattern/_Bullet..."
 		    "Beveled pattern bullet"
 		    "Federico Mena Quintero"
 		    "Federico Mena Quintero"
Index: scripts/beveled-pattern-button.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/beveled-pattern-button.scm,v
retrieving revision 1.20
diff -p -u -r1.20 beveled-pattern-button.scm
--- scripts/beveled-pattern-button.scm	23 Sep 2004 11:44:32 -0000	1.20
+++ scripts/beveled-pattern-button.scm	11 Oct 2004 01:01:57 -0000
@@ -24,6 +24,11 @@
 ; All calls to gimp-text-* have been converted to use the *-fontname form.
 ; The corresponding parameters have been replaced by an SF-FONT parameter.
 ; ************************************************************************
+; Changed on Oct 9, 2004 by Carol Spears <carol@gimp.org>
+; For use with GIMP 2.1.
+; Moved menu location from Xtns/Script-Fu/Web Page Themes/Beveled Pattern/B_utton... 
+; to Xtns/Render/Themes/Web/Beveled Pattern/B_utton...
+; ************************************************************************
 
 (define (text-width extents)
   (car extents))
@@ -113,7 +118,7 @@
 
 
 (script-fu-register "script-fu-beveled-pattern-button"
-		    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Beveled Pattern/B_utton..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Beveled Pattern/B_utton..."
 		    "Beveled pattern button"
 		    "Federico Mena Quintero"
 		    "Federico Mena Quintero"
Index: scripts/beveled-pattern-heading.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/beveled-pattern-heading.scm,v
retrieving revision 1.18
diff -p -u -r1.18 beveled-pattern-heading.scm
--- scripts/beveled-pattern-heading.scm	23 Sep 2004 11:44:32 -0000	1.18
+++ scripts/beveled-pattern-heading.scm	11 Oct 2004 01:01:57 -0000
@@ -24,6 +24,11 @@
 ; All calls to gimp-text-* have been converted to use the *-fontname form.
 ; The corresponding parameters have been replaced by an SF-FONT parameter.
 ; ************************************************************************
+; Changed on Oct 9, 2004 by Carol Spears <carol@gimp.org>
+; For use with GIMP 2.1.
+; Moved menu location from Xtns/Script-Fu/Web Page Themes/Beveled Pattern/H_eading... to 
+; Xtns/Render/Themes/Web/Beveled Pattern/H_eading...
+; ************************************************************************
 
 
 (define (script-fu-beveled-pattern-heading
@@ -100,7 +105,7 @@
 
 
 (script-fu-register "script-fu-beveled-pattern-heading"
-		    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Beveled Pattern/H_eading..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Beveled Pattern/H_eading..."
 		    "Beveled pattern heading"
 		    "Federico Mena Quintero"
 		    "Federico Mena Quintero"
Index: scripts/beveled-pattern-hrule.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/beveled-pattern-hrule.scm,v
retrieving revision 1.16
diff -p -u -r1.16 beveled-pattern-hrule.scm
--- scripts/beveled-pattern-hrule.scm	23 Sep 2004 11:44:32 -0000	1.16
+++ scripts/beveled-pattern-hrule.scm	11 Oct 2004 01:01:57 -0000
@@ -18,6 +18,12 @@
 ; You should have received a copy of the GNU General Public License
 ; along with this program; if not, write to the Free Software
 ; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+; ************************************************************************
+; Changed on Oct 9, 2004 by Carol Spears <carol@gimp.org>
+; For use with GIMP 2.1.
+; Moved menu location from Xtns/Script-Fu/Web Page Themes/Beveled Pattern/_Hrule... to 
+; Xtns/Render/Themes/Web/Beveled Pattern/_Hrule...
+; ************************************************************************
 
 
 (define (script-fu-beveled-pattern-hrule width height pattern)
@@ -70,7 +76,7 @@
 
 
 (script-fu-register "script-fu-beveled-pattern-hrule"
-		    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Beveled Pattern/_Hrule..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Beveled Pattern/_Hrule..."
 		    "Beveled pattern hrule"
 		    "Federico Mena Quintero"
 		    "Federico Mena Quintero"
Index: scripts/flatland.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/flatland.scm,v
retrieving revision 1.11
diff -p -u -r1.11 flatland.scm
--- scripts/flatland.scm	3 Oct 2004 22:50:50 -0000	1.11
+++ scripts/flatland.scm	11 Oct 2004 01:01:57 -0000
@@ -57,7 +57,7 @@
 ))
 
 (script-fu-register "script-fu-flatland"
-		    _"<Toolbox>/Xtns/Script-Fu/Patterns/_Flatland..."
+		    _"<Toolbox>/Xtns/Render/Patterns/_Flatland..."
 		    "A Land Pattern"
 		    "Adrian Likins <aklikins@eos.ncsu.edu>"
 		    "Adrian Likins"
Index: scripts/font-map.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/font-map.scm,v
retrieving revision 1.18
diff -p -u -r1.18 font-map.scm
--- scripts/font-map.scm	22 Sep 2004 23:33:29 -0000	1.18
+++ scripts/font-map.scm	11 Oct 2004 01:01:57 -0000
@@ -127,8 +127,8 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-font-map"
-		    _"<Toolbox>/Xtns/Script-Fu/Utils/_Font Map..."
-		    "Generate a listing of fonts matching a filter"
+		    _"<Toolbox>/Xtns/Utility/_Font Map..."
+		    "Generate a listing of fonts matching a filter.  This can be a very large image depending on what you search on."
 		    "Spencer Kimball"
 		    "Spencer Kimball"
 		    "1997"
Index: scripts/gimp-headers.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/gimp-headers.scm,v
retrieving revision 1.21
diff -p -u -r1.21 gimp-headers.scm
--- scripts/gimp-headers.scm	22 Sep 2004 23:33:29 -0000	1.21
+++ scripts/gimp-headers.scm	11 Oct 2004 01:01:57 -0000
@@ -35,6 +35,11 @@
 ; All calls to gimp-text-* have been converted to use the *-fontname form.
 ; The corresponding parameters have been replaced by an SF-FONT parameter.
 ; ************************************************************************
+; Changed on Oct 9, 2004 by Carol Spears <carol@gimp.org>
+; For use with GIMP 2.1.
+; Moved menu location from Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org/_Big Header... to 
+; Xtns/Render/Themes/Web/Classic.Gimp.Org/_Big Header...
+; ************************************************************************
 
 (define (script-fu-headers-gimp-org text font font-size text-color high-color side-color shadow-color crop rm-bg index num-colors)
   (let* ((img (car (gimp-image-new 256 256 RGB)))
@@ -132,7 +137,7 @@
 
 
 (script-fu-register "script-fu-big-header-gimp-org"
-		    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org/_Big Header..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Classic.Gimp.Org/_Big Header..."
 		    "Big Gimp.org Header"
 		    "Adrian Likins & Jens Lautenbacher"
 		    "Adrian Likins & Jens Lautenbacher"
Index: scripts/gimp-labels.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/gimp-labels.scm,v
retrieving revision 1.20
diff -p -u -r1.20 gimp-labels.scm
--- scripts/gimp-labels.scm	22 Sep 2004 23:33:29 -0000	1.20
+++ scripts/gimp-labels.scm	11 Oct 2004 01:01:57 -0000
@@ -35,6 +35,11 @@
 ; All calls to gimp-text-* have been converted to use the *-fontname form.
 ; The corresponding parameters have been replaced by an SF-FONT parameter.
 ; ************************************************************************
+; Changed on Oct 9, 2004 by Carol Spears <carol@gimp.org>
+; For use with GIMP 2.1.
+; Moved menu location from Xtns/Render/Themes/Web/Classic.Gimp.Org/_Tube Button Label... to 
+; Xtns/Render/Themes/Web/Classic.Gimp.Org/_Tube Button Label...
+; ************************************************************************
 
 
 (define (script-fu-labels-gimp-org text font font-size text-color shadow-color bg-color rm-bg index num-colors color-thresh yoff xoff height)
@@ -105,7 +110,7 @@
 
 
 (script-fu-register "script-fu-tube-button-label-gimp-org"
-		    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org/_Tube Button Label..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Classic.Gimp.Org/_Tube Button Label..."
 		    "Tube Button Label Header for gimp.org"
 		    "Adrian Likins & Jens Lautenbacher"
 		    "Adrian Likins & Jens Lautenbacher"
@@ -116,7 +121,7 @@
 		    SF-TOGGLE _"Index image" TRUE)
 
 (script-fu-register "script-fu-tube-subbutton-label-gimp-org"
-		    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org/T_ube Sub-Button Label..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Classic.Gimp.Org/T_ube Sub-Button Label..."
 		    "Tube Button Label Header for gimp.org"
 		    "Adrian Likins & Jens Lautenbacher"
 		    "Adrian Likins & Jens Lautenbacher"
@@ -127,7 +132,7 @@
 		    SF-TOGGLE _"Index image" TRUE)
 
 (script-fu-register "script-fu-tube-subsubbutton-label-gimp-org"
-		    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org/Tub_e Sub-Sub-Button Label..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Classic.Gimp.Org/Tub_e Sub-Sub-Button Label..."
 		    "Tube Button Label Header for gimp.org"
 		    "Adrian Likins & Jens Lautenbacher"
 		    "Adrian Likins & Jens Lautenbacher"
@@ -139,7 +144,7 @@
 
 
 (script-fu-register "script-fu-labels-gimp-org"
-		    _"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org/_General Tube Labels..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Classic.Gimp.Org/_General Tube Labels..."
 		    "Tube Button Label Header for gimp.org"
 		    "Adrian Likins & Jens Lautenbacher"
 		    "Adrian Likins & Jens Lautenbacher"
Index: scripts/gradient-example.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/gradient-example.scm,v
retrieving revision 1.15
diff -p -u -r1.15 gradient-example.scm
--- scripts/gradient-example.scm	22 Sep 2004 23:33:29 -0000	1.15
+++ scripts/gradient-example.scm	11 Oct 2004 01:01:57 -0000
@@ -56,7 +56,7 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-gradient-example"
-		    _"<Toolbox>/Xtns/Script-Fu/Utils/Custom _Gradient..."
+		    _"<Toolbox>/Xtns/Utility/Custom _Gradient..."
 		    "Create an example image of a custom gradient"
 		    "Federico Mena Quintero"
 		    "Federico Mena Quintero"
Index: scripts/land.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/land.scm,v
retrieving revision 1.17
diff -p -u -r1.17 land.scm
--- scripts/land.scm	3 Oct 2004 22:50:50 -0000	1.17
+++ scripts/land.scm	11 Oct 2004 01:01:57 -0000
@@ -68,7 +68,7 @@
 ))
 
 (script-fu-register "script-fu-land"
-		    _"<Toolbox>/Xtns/Script-Fu/Patterns/_Land..."
+		    _"<Toolbox>/Xtns/Render/Patterns/_Land..."
 		    "A Topgraphic map pattern"
 		    "Adrian Likins <aklikins@eos.ncsu.edu>"
 		    "Adrian Likins"
Index: scripts/mkbrush.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/mkbrush.scm,v
retrieving revision 1.20
diff -p -u -r1.20 mkbrush.scm
--- scripts/mkbrush.scm	23 Sep 2004 19:22:04 -0000	1.20
+++ scripts/mkbrush.scm	11 Oct 2004 01:01:57 -0000
@@ -7,6 +7,9 @@
 ; 18-Dec-2000 fixed to work with the new convention (not inverted) of
 ;             gbr saver (jtl@gimp.org)
 ;
+; 09-Oct-2004 moved it out of Xtns/Script-fu/Make Brush/ and into 
+:             Xtns/Utility/Make Brush/ (carol@gimp.org)
+;
 ; This program is free software; you can redistribute it and/or modify
 ; it under the terms of the GNU General Public License as published by
 ; the Free Software Foundation; either version 2 of the License, or
@@ -57,8 +60,8 @@
     (gimp-context-set-brush name)))
 
 (script-fu-register "script-fu-make-brush-rectangular"
-		    _"<Toolbox>/Xtns/Script-Fu/Make Brush/_Rectangular..."
-		    "Create size of brush"
+		    _"<Toolbox>/Xtns/Utility/Make Brush/_Rectangular..."
+		    "Create different sizes of a rectangular brush.  After you touch the ok button, look in the brush palette to find your new brush."
 		    "Seth Burgess <sjburges@ou.edu>"
 		    "Seth Burgess"
 		    "1997"
@@ -114,8 +117,8 @@
     (gimp-context-set-brush name)))
 
 (script-fu-register "script-fu-make-brush-rectangular-feathered"
-            _"<Toolbox>/Xtns/Script-Fu/Make Brush/Re_ctangular, Feathered..."
-            "Create size of brush"
+            _"<Toolbox>/Xtns/Utility/Make Brush/Re_ctangular, Feathered..."
+            "Create different sizes of a rectangular and feathered brush. After you touch the ok button, look in the brush palette to find your new brush."
             "Seth Burgess <sjburges@ou.edu>"
             "Seth Burgess"
             "1997"
@@ -161,8 +164,8 @@
     (gimp-context-set-brush name)))
 
 (script-fu-register "script-fu-make-brush-elliptical"
-		    _"<Toolbox>/Xtns/Script-Fu/Make Brush/_Elliptical..."
-		    "Create size of brush"
+		    _"<Toolbox>/Xtns/Utility/Make Brush/_Elliptical..."
+		    "Create  different sizes of an eliptical brush.  After you touch the ok button, look in the brush palette to find your new brush."
 		    "Seth Burgess <sjburges@ou.edu>"
 		    "Seth Burgess"
 		    "1997"
@@ -220,8 +223,8 @@
     (gimp-context-set-brush name)))
 
 (script-fu-register "script-fu-make-brush-elliptical-feathered"
-		    _"<Toolbox>/Xtns/Script-Fu/Make Brush/Elli_ptical, Feathered..."
-		    "Makes a feathered elliptical brush of specified size"
+		    _"<Toolbox>/Xtns/Utility/Make Brush/Elli_ptical, Feathered..."
+		    "Makes a feathered elliptical brush of specified size.  After you touch the ok button, look in the brush palette to find your new brush."
 		    "Seth Burgess <sjburges@ou.edu>"
 		    "Seth Burgess"
 		    "1997"
Index: scripts/pupi-button.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/pupi-button.scm,v
retrieving revision 1.23
diff -p -u -r1.23 pupi-button.scm
--- scripts/pupi-button.scm	23 Sep 2004 01:44:56 -0000	1.23
+++ scripts/pupi-button.scm	11 Oct 2004 01:01:57 -0000
@@ -10,6 +10,11 @@
 ; All calls to gimp-text-* have been converted to use the *-fontname form.
 ; The corresponding parameters have been replaced by an SF-FONT parameter.
 ; ************************************************************************
+; Changed on Oct 9, 2004 by Carol Spears <carol@gimp.org>
+; For use with GIMP 2.1.
+; Moved menu location from Xtns/Script-fu/Buttons to 
+; Xtns/Render/Themes/Web/Buttons
+; ************************************************************************
 ; 
 ; This program is free software; you can redistribute it and/or modify
 ; it under the terms of the GNU General Public License as published by
@@ -180,7 +185,7 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-round-button"
-		    _"<Toolbox>/Xtns/Script-Fu/Buttons/_Round Button..."
+		    _"<Toolbox>/Xtns/Render/Themes/Web/Buttons/_Round Button..."
 		    "Round button"
 		    "Arturo Espinosa (stolen from quartic's beveled button)"
 		    "Arturo Espinosa & Federico Mena Quintero"
Index: scripts/rendermap.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/rendermap.scm,v
retrieving revision 1.26
diff -p -u -r1.26 rendermap.scm
--- scripts/rendermap.scm	3 Oct 2004 22:50:50 -0000	1.26
+++ scripts/rendermap.scm	11 Oct 2004 01:01:57 -0000
@@ -73,7 +73,7 @@
   (gimp-context-pop)))
 
 (script-fu-register "script-fu-render-map"
-		    _"<Toolbox>/Xtns/Script-Fu/Patterns/Render _Map..."
+		    _"<Toolbox>/Xtns/Render/Patterns/Render _Map..."
 		    "Another pattern which resembles a map"
 		    "Chris Gutteridge: cjg@ecs.soton.ac.uk"
 		    "28th April 1998"
Index: scripts/sphere.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/sphere.scm,v
retrieving revision 1.20
diff -p -u -r1.20 sphere.scm
--- scripts/sphere.scm	23 Sep 2004 11:16:23 -0000	1.20
+++ scripts/sphere.scm	11 Oct 2004 01:01:57 -0000
@@ -65,7 +65,7 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-sphere"
-		    _"<Toolbox>/Xtns/Script-Fu/Misc/_Sphere..."
+		    _"<Toolbox>/Xtns/Render/Shapes/_Sphere..."
 		    "Simple sphere with a drop shadow"
 		    "Spencer Kimball"
 		    "Spencer Kimball"
Index: scripts/swirltile.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/swirltile.scm,v
retrieving revision 1.15
diff -p -u -r1.15 swirltile.scm
--- scripts/swirltile.scm	23 Sep 2004 11:16:23 -0000	1.15
+++ scripts/swirltile.scm	11 Oct 2004 01:01:57 -0000
@@ -43,7 +43,7 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-swirl-tile"
-		    _"<Toolbox>/Xtns/Script-Fu/Patterns/Swirl-_Tile..."
+		    _"<Toolbox>/Xtns/Render/Patterns/Swirl-_Tile..."
 		    "Create an interesting swirled tile"
 		    "Adrian Likins <aklikins@eos.ncsu.edu>"
 		    "Adrian Likins"
Index: scripts/swirly-pattern.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/swirly-pattern.scm,v
retrieving revision 1.13
diff -p -u -r1.13 swirly-pattern.scm
--- scripts/swirly-pattern.scm	23 Sep 2004 11:16:23 -0000	1.13
+++ scripts/swirly-pattern.scm	11 Oct 2004 01:01:57 -0000
@@ -77,7 +77,7 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-swirly-pattern"
-		    _"<Toolbox>/Xtns/Script-Fu/Patterns/_Swirly..."
+		    _"<Toolbox>/Xtns/Render/Patterns/_Swirly..."
 		    "Create a swirly pattern"
 		    "Federico Mena Quintero"
 		    "Federico Mena Quintero"
Index: scripts/test-sphere.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/test-sphere.scm,v
retrieving revision 1.39
diff -p -u -r1.39 test-sphere.scm
--- scripts/test-sphere.scm	6 Oct 2004 15:20:29 -0000	1.39
+++ scripts/test-sphere.scm	11 Oct 2004 01:01:57 -0000
@@ -210,7 +210,7 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-test-sphere"
-		    "<Toolbox>/Xtns/Script-Fu/Test/_Sphere..."
+		    "<Toolbox>/Xtns/Render/Shapes/_Test Sphere..."
 		    "Simple script to test and show the usage of the new Script-Fu API extensions."
 		    "Spencer Kimball, Sven Neumann"
 		    "Spencer Kimball"
Index: scripts/truchet.scm
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/script-fu/scripts/truchet.scm,v
retrieving revision 1.18
diff -p -u -r1.18 truchet.scm
--- scripts/truchet.scm	23 Sep 2004 11:16:23 -0000	1.18
+++ scripts/truchet.scm	11 Oct 2004 01:01:58 -0000
@@ -146,7 +146,7 @@
     (gimp-context-pop)))
 
 (script-fu-register "script-fu-truchet"
-		    _"<Toolbox>/Xtns/Script-Fu/Patterns/T_ruchet..."
+		    _"<Toolbox>/Xtns/Render/Patterns/T_ruchet..."
 		    "Create a Truchet pattern \n\nWorks best with even sized thicknesses"
 		    "Adrian Likins <aklikins@eos.ncsu.edu>"
 		    "Adrian Likins"
