--- ./lib/menu.orig	Fri Apr 27 03:32:20 2001
+++ ./lib/menu	Wed May 16 20:55:16 2001
@@ -1,70 +1,117 @@
-prog xterm xterm xterm
-prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
-prog fte fte fte
-prog Netscape netscape netscape
-prog Gimp gimp gimp
+prog "xterm" "xterm" xterm
+prog "rxvt" "xterm" rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
+prog "fte" "fte" fte
+prog "Netscape" "netscape" netscape
+prog "Mozilla" "mozilla" mozilla
+prog "Konqueror" "konqueror" konqueror
+prog "xfsamba" "xfsamba" xfsamba
 separator
-menu Applications folder {
-    menu Editors folder {
-        prog fte fte fte
-	prog vim vim gvim 
-        prog xemacs xemacs xemacs
-        prog emacs emacs emacs
-        prog xedit xedit xedit
-        prog Lyx emacs lyx
-    }
-    menu "WWW Browsers" folder {
-        prog Netscape netscape netscape
-        prog Arena arena arena
-        prog Lynx lynx xterm -e lynx
-    }
-    menu Graphics folder {
-        prog Gimp gimp gimp
-        prog XV xv xv
-        prog XPaint xpaint xpaint
-        prog XFig xfig xfig
-    }
-    menu Devel folder {
-        prog ddd ddd ddd
-    }
-    prog "Acrobat Reader" pdf acroread
-    prog "DVI Previewer" xdvi xdvi
-    prog "Ghostview" ghostview gv
-    prog "xfm" xfm xfm
-}
-menu Games folder {
-    prog "Koules for X" koules xkoules -f
-    prog Xboing xboing xboing
-    prog Xboard xboard xboard
-    prog XGalaga xgalaga xgal
-    prog XDemineur xdemineur xdemineur
-}
-menu System folder {
-    prog "Control Panel" redhat control-panel
-    prog xload xload xload
-    prog xosview xosview xosview
-}
-menu Utilities folder {
-    menu Multimedia folder {
-        prog XPlayCD xplaycd xplaycd
-        prog XMixer xmixer xmixer
-    }
-    prog "Font Selector" xfontsel xfontsel
-    prog Clock xclock xclock
-    prog Magnify xmag xmag
-    prog Calculator xcalc xcalc
-    prog Colormap xcolormap xcmap
-    prog Clipboard xclip xclipboard
-    prog xkill bomb xkill
-    separator
-    prog "Screen Saver" xlock xlock -nolock
-    prog "Screen Lock" xlock xlock
-}
-menu "Window Managers" folder {
-    restart icewm - icewm
-    restart wmaker - wmaker
-    restart enlightenment - enlightenment
-    restart blackbox - blackbox
-    restart fvwm2 - fvwm2
-    restart fvwm - fvwm
+menu "System" "folder" {
+    prog "Control Panel" "redhat" control-panel
+    prog "xload" "xload" xload
+    prog "xosview" "xosview" xosview
+}
+menu "Applications" "folder" {
+    menu "Editors" "folder" {
+        prog "fte" "fte" fte
+        prog "vim" "vim" gvim
+        prog "xemacs" "xemacs" xemacs
+        prog "emacs" "emacs" emacs
+        prog "xedit" "xedit" xedit
+        prog "Lyx" "emacs" lyx
+    }
+    menu "Graphics - editors" "folder" {
+        prog "Gimp" "gimp" gimp
+        prog "XV" "xv" xv
+        prog "XPaint" "xpaint" xpaint
+        prog "XFig" "xfig" xfig
+    }
+    menu "Graphics - viewers" "folder" {
+        prog "GTKsee" "gtksee" gtksee
+        prog "Xzgv" "xzgv" xzgv
+        prog "Electric Eyes" "ee" ee
+    }
+    menu "Devel" "folder" {
+        prog "ddd" "ddd" ddd
+        prog "gcvs" "gcvs" gcvs
+    }
+    prog "Acrobat Reader" "pdf" acroread
+    prog "Xpdf" "xpdf" xpdf
+    prog "DVI Previewer" "xdvi" xdvi
+    prog "Ghostview" "ghostview" gv
+    prog "xfm" "xfm" xfm
+}
+menu "Games" "folder" {
+    prog "Koules for X" "koules" xkoules -f
+    prog "Xboing" "xboing" xboing
+    prog "Xboard" "xboard" xboard
+    prog "XGalaga" "xgalaga" xgal
+    prog "XDemineur" "xdemineur" xdemineur
+}
+menu "Utilities" "folder" {
+    prog "Font Selector" "xfontsel" xfontsel
+    prog "Clock" "xclock" xclock
+    prog "Magnify" "xmag" xmag
+    prog "Calculator" "xcalc" xcalc
+    prog "Colormap" "xcolormap" xcmap
+    prog "Clipboard" "xclip" xclipboard
+    prog "xkill" "bomb" xkill
+    prog "Screen Saver" "xscreensaver" xscreensaver
+    prog "Screen Lock" "xlock" xlock
+}
+menu "Multimedia" "folder" {
+    prog "Xmms" "xmms" xmms
+    prog "XPlayCD" "xplaycd" xplaycd
+    prog "XMixer" "xmixer" xmixer
+    prog "gtv" "gtv" gtv
+    prog "CD plyer" "gtcd" gtcd
+}
+menu "Network" "folder" {
+    menu "WWW Browsers" "folder" {
+        prog "Netscape" "netscape" netscape
+        prog "Mozilla" "mozilla" mozilla
+        prog "Konqueror" "konqueror" konqueror
+        prog "Links" "links" xterm -e links
+        prog "Arena" "arena" arena
+        prog "Lynx" "lynx" xterm -e lynx
+    }
+    menu "IRC" "folder" {
+        prog "BitchX" "BitchX" xterm -e BitchX
+        prog "Xchat" "xchat" xchat
+    }
+    menu "Mail" "folder" {
+        prog "Pine" "pine" xterm -e pine
+        prog "Mutt" "mutt" xterm -e mutt
+        prog "Netscape-Communicator" "netscape-communicator" netscape-communicator
+    }
+    menu "Misc" "folder" {
+        prog "Etherape" "etherape" etherape
+        prog "Ethereal" "ethereal" ethereal
+    }
+    menu "Ftp" "folder" {
+        prog "NCftp" "ncftp" xterm -e ncftp
+    }
+    menu "News" "folder" {
+    }
+    menu "NetBIOS" "folder" {
+        prog "LinNeighborhood" "LinNeighborhood" LinNeighborhood
+        prog "xfsamba" "xfsamba" xfsamba
+        prog "Gnomba" "gnomba" gnomba
+    }
+    prog "telnet" "telnet" xterm -e telnet
+    prog "nmapfe" "nmapfe" nmapfe
+}
+menu "Window Managers" "folder" {
+    restart "icewm" "-" icewm
+    restart "wmaker" "-" wmaker
+    restart "enlightenment" "-" enlightenment
+    restart "blackbox" "-" blackbox
+    restart "fvwm2" "-" fvwm2
+    restart "fvwm" "-" fvwm
+}
+separator
+menu "Settings" "folder" {
+    prog "Menu editor - Iceme" "iceme" iceme
+    prog "Preferences" "icepref" icepref
+    prog "Menu editor - IceMC" "icemc" 
 }