--- /usr/bin/fluxbox-generate_menu	2007-04-29 18:48:51.000000000 +0200
+++ /usr/bin/fluxbox-generate_better	2007-04-29 18:46:17.000000000 +0200
@@ -1286,6 +1286,7 @@
         -g) GNOMEMENU=yes; shift;;
         -in) NO_ICON=yes; shift;;
         -is) OTHER_ICONPATHS="
+                /usr/share/{icons,pixmaps}
                 /usr/share/icons,
                 /usr/share/icons/mini,
                 /usr/share/pixmaps,
@@ -1514,6 +1515,7 @@
 echo "[begin] (${MENUTITLE})" >> ${MENUFILENAME}
 
 append "[exec] (${DEFAULT_TERMNAME}) {${DEFAULT_TERM}}"
+find_it guilogon  append "[exec] (SAP Logon)  {guilogon}"
 
 case "$DEFAULT_BROWSERNAME" in
     links|w3m|lynx)  append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
@@ -1581,12 +1583,12 @@
         cli_find ncftp pftp ftp lftp yafc
     append_menu_end
 
-    normal_find xnmap skype x3270
+    normal_find xnmap skype x3270 wpa_gui
 
 append_menu_end
 
 append_submenu "${EDITORMENU}"
-    normal_find gvim bluefish nedit gedit xedit kword kwrite kate anjuta \
+    normal_find gvim bluefish jedit nedit gedit xedit kword kwrite kate anjuta \
         wings xemacs emacs kvim cream evim scite Ted
     cli_find nano vim vi zile jed joe
     find_it     emacs  append "[exec]   (emacs-nw) {${DEFAULT_TERM} -e emacs -nw}"
@@ -1595,7 +1597,7 @@
 
 append_submenu "${EDUCATIONMENU}"
     normal_find celestia scilab geomview scigraphica oregano xcircuit electric \
-        pymol elem chemtool xdrawchem stellarium   
+        pymol elem gperiodic chemtool xdrawchem stellarium   
     find_it drgeo          append "[exec] (Dr. Geo) {drgeo}"
     find_it     R          append "[exec] (R) {${DEFAULT_TERM} -e R --gui=gnome}"
     cli_find maxima grace yacas octave gnuplot grass coq acl
@@ -1799,12 +1801,12 @@
         find_it ${LAUNCHER} append "[exec] (${RUNCOMMAND}) {${LAUNCHER} $FBRUNOPTIONS}"
         find_it switch append "[exec] (gtk-theme-switch) {switch}"
         find_it switch2 append "[exec] (gtk2-theme-switch) {switch2}"
-        find_it fluxbox-generate_menu append "[exec] (${REGENERATEMENU}) {fluxbox-generate_menu}"
+        find_it fluxbox-generate_menu append "[exec] (${REGENERATEMENU}) {fluxbox-generate_menu -is -ds}"
     append_menu_end
 
     append_submenu ${WINDOWMANAGERS}
     #hard to properly maintain since there are so many exceptions to the rule.
-    for wm in icewm ion kde sawfish enlightenment fvwm openbox evilwm waimea xfce pekwm xfce4 fvwm2 blackbox ; do
+    for wm in mwm twm icewm ion kde sawfish enlightenment fvwm openbox evilwm waimea xfce pekwm xfce4 fvwm2 blackbox ; do
         find_it start${wm} append "[restart] (${wm}) {start${wm}}" ||\
             find_it ${wm} append "[restart] (${wm}) {${wm}}"
     done