Fix simplified menu

1 files changed, 98 insertions, 427 deletions

diff --git a/menu/mandrake_desk b/menu/mandrake_desk
index abde2e6..ce21701 100644
--- a/menu/mandrake_desk
+++ b/menu/mandrake_desk
@@ -1,154 +1,86 @@
 ## Administer your system
-# aumix
-?package(aumix): needs="gnome" section="Administer your system" title="Configure sound settings" command="/usr/bin/aumix" icon="aumix.xpm"
+# Configure sound settings
+?package(kdemultimedia): needs="kde" kde_filename="kmix" section="Administer your system" title="Configure sound settings" icon="kmix.png" command="kmix" kde_command="kmix -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nBinaryPattern=kmix;\\nProtocols=\\nDocPath=kmix/index.html\\nTerminalOptions=\\nPath=\\nExtensions=\\nTerminal=0\\nKDE-X-StartupNotify=true"
+?package(gmix): needs="gnome" section="Administer your system" title="Configure sound settings" command="/usr/bin/gmix" icon="gmix.xpm"
 
 
-# control-center
-?package(control-center): command="/usr/bin/gnomecc" icon="/usr/share/pixmaps/control-center.png" title="Configure Gnome" needs="gnome" section="Administer your system"
+# Configure KDE/GNOME
+?package(gnome-control-center): command="/usr/bin/gnomecc" icon="/usr/share/pixmaps/control-center.png" title="Configure Gnome" needs="gnome" section="Administer your system"
+?package(kdebase): needs="kde" kde_filename="KControl" section="Administer your system" title="Configure KDE" icon="kcontrol.png" command="kcontrol" kde_command="kcontrol -caption \"%c\" %i %m" kde_opt="\\nDocPath=kcontrol/index.html\\nX-KDE-StartupNotify=true"
 
 
-# drakconf
-?package(drakconf): needs="x11" icon="drakconf.xpm" section="Administer your system" title="Mandrake Control Center" command="/usr/X11R6/bin/drakconf"
+# Mandrake Control Center
+?package(drakconf): needs="x11" icon="drakconf.png" section="Administer your system" title="Mandrake Control Center" command="/usr/X11R6/bin/drakconf"
 
 
-# drakfont
+# Font configuration
 ?package(drakfont): needs="X11" section="Administer your system" title="Add or remove fonts" command="/usr/X11R6/bin/drakfont" icon="drakfont.xpm"
 
 
-# gnome-linuxconf
-?package(gnome-linuxconf):needs="X11" section="Administer your system" title="Administer your system using LinuxConf" command="/sbin/linuxconf" description="An extremely capable system configuration tool." icon="linuxconf.xpm"
-
-
-# gnome-core
-?package(gnome-core): command="NO_XALF /usr/bin/gnome-terminal --use-factory --start-factory-server" icon="gnome-terminal.xpm" title="Open a terminal" needs="gnome" section="Administer your system"
-
-
-# fetchmailconf
-?package(fetchmailconf): command="fetchmailconf" icon="fetchmailconf.xpm" needs="x11" title="Configure Fetchmail" section="Administer your system"
-
-
-# gnome-utils
+# Format a floppy
 ?package(gnome-utils): needs="gnome" section="Administer your system" title="Format a floppy" command="/usr/bin/gfloppy" icon="gfloppy.xpm"
+?package(kdeutils): needs="kde" kde_filename="KFloppy" section="Administer your system" title="Format a floppy" icon="kfloppy.png" command="kfloppy" kde_command="kfloppy -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nBinaryPattern=kfloppy;\\nProtocols=\\nDocPath=kfloppy/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
 
-# harddrake
-?package(harddrake):needs="X11" section="Administer your system" title="Configure your hardware" command="/usr/bin/harddrake-auth" icon="harddrake.xpm"
-
-
-# kdeadmin
-?package(kdeadmin): needs="x11" kde_filename="kcron" section="Administer your system" title="Schedule programs to run in the background" icon="kcron.png" command="kcron" kde_command="kcron %i %m -caption \"%c\"" kde_opt="\\nDocPath=kcron/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-
-# kdebase
-?package(kdebase): needs="kde" kde_filename="KControl" section="Administer your system" title="Administer KDE" icon="kcontrol.png" command="kcontrol" kde_command="kcontrol -caption \"%c\" %i %m" kde_opt="\\nDocPath=kcontrol/index.html\\nX-KDE-StartupNotify=true"
-
-?package(kdebase): needs="kde" kde_filename="konsole" section="Administer your system" title="Open a terminal" icon="konsole.png" command="konsole" kde_command="konsole %i %m" kde_opt="\\nDocPath=konsole/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true"
-
+# File manager
 ?package(kdebase): needs="kde" kde_filename="Home" section="Administer your system" title="Manage your files" icon="folder_home.png" command="kfmclient openProfile filemanagement" kde_opt="\\nTerminal=0"
+?package(nautilus):command="/usr/bin/nautilus --no-desktop" needs="gnome" section="Administer your system" title="Manage your files" icon="nautilus.xpm"
 
 
-# kdemultimedia
-?package(kdemultimedia): needs="kde" kde_filename="kmix" section="Administer your system" title="Configure sound settings" icon="kmix.png" command="kmix" kde_command="kmix -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nBinaryPattern=kmix;\\nProtocols=\\nDocPath=kmix/index.html\\nTerminalOptions=\\nPath=\\nExtensions=\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-
-# kdeutils
-?package(kdeutils): needs="kde" kde_filename="KFloppy" section="Administer your system" title="Format a floppy" icon="kfloppy.png" command="kfloppy" kde_command="kfloppy -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nBinaryPattern=kfloppy;\\nProtocols=\\nDocPath=kfloppy/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
+# Password change
 ?package(kdeutils): needs="x11" kde_filename="kdepasswd" section="Administer your system" title="Change your password" icon="password.png" command="kdepasswd" kde_opt="\\nTerminalOptions=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
 
-# menudrake
-?package(menudrake): command="/usr/bin/menudrake" needs="X11" section="Administer your system" icon="menudrake.xpm" title="Manage your menus"
-
-
-# nautilus
-?package(nautilus):command="/usr/bin/nautilus --no-desktop" needs="gnome" section="Administer your system" title="Manage your files" icon="nautilus.xpm"
-
 
-# qtcups
-?package(qtcups): needs=X11 section="Administer your system" title="Configure your printer(s)" command="/usr/bin/qtcups -j none" icon="/usr/share/icons/locolor/16x16/apps/qtcups.png"
+# Printer admin
+?package(qtcups): needs="kde" section="Administer your system" title="Configure your printer(s)" command="/usr/bin/qtcups -j none" icon="/usr/share/icons/locolor/16x16/apps/qtcups.png"
+?package(xpp): needs="gnome" section="Administer your system" title="Configure your printer(s)" command="xpp" icon="/usr/share/icons/locolor/16x16/apps/xpp.png"
 
 
-# samba
-?package(samba):command="gnome-moz-remote http://localhost:901/" needs="gnome" icon="swat.xpm" section="Administer your system" title="Configure samba"
+# samba configuration
+?package(samba-swat):command="gnome-moz-remote http://localhost:901/" needs="gnome" icon="swat.xpm" section="Administer your system" title="Configure samba"
 
-?package(samba):command="sh -c '$BROWSER http://localhost:901/'" needs="x11" icon="swat.xpm" section="Administer your system" title="Configure samba"
+?package(samba-swat):command="sh -c '$BROWSER http://localhost:901/'" needs="x11" icon="swat.xpm" section="Administer your system" title="Configure samba"
 
 
-# wizdrake
-?package(wizdrake): needs="X11" icon="net-mdk.png" section="Administer your system" title="Configure servers using a set of wizards" command="wizdrake"
-
-
-# rpmdrake
+# Package admin
 ?package(rpmdrake):needs="x11" section="Administer your system" title="Add or remove programs" command="rpmdrake"icon="rpmdrake.xpm"
 
-?package(rpmdrake): needs="X11" icon="mandrakeupdate.xpm" section="Administer your system" title="Download and install Mandrake security updates" command="MandrakeUpdate"
+?package(rpmdrake): needs="x11" icon="mandrakeupdate.xpm" section="Administer your system" title="Download and install Mandrake security updates" command="MandrakeUpdate"
 
 ?package(rpmdrake):needs="kde" section=".hidden" title="Software installer" command="rpminst --files %F" mimetypes="application/x-rpm" kde_opt="InitialPreference=6\\nTerminal=false" icon="rpmdrake.xpm"
 
 
-# userdrake
+# User admin
 ?package(userdrake): command="/usr/bin/userdrake" needs="X11" section="Administer your system" icon="userdrake.png" title="Manage users"
 
 
-# xpp
-?package(xpp): needs=X11 section="Administer your system" title="Configure your printer(s)" command="xpp" icon="/usr/share/icons/locolor/16x16/apps/xpp.png"
-
-
-
-
-
 ## Locate a file
-# gnome-utils
 ?package(gnome-utils):needs="gnome" section="/" title="Find files" command="/usr/bin/gsearchtool" icon="gnome-searchtool.xpm"
-
-
-# kdebase
 ?package(kdeutils): needs="kde" kde_filename="Kfind" section="/" title="Find files" icon="kfind.png" command="kfind" kde_command="kfind -caption \"%c\" %i %m %f" multiple_files="false" accept_url="false" kde_opt="\\nBinaryPattern=kfind;\\nProtocols=file;\\nDocPath=kfind/index.html\\nTerminalOptions=\\nPath=\\nExtensions=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
+## Entertain yourself
+# Listen to a CD
+?package(gnome-media):needs="gnome" command="/usr/bin/gtcd" section="Entertain yourself" title="Listen to a CD" icon="/usr/share/pixmaps/gtcd.png"
+?package(kdemultimedia): needs="kde" kde_filename="kscd" section="Entertain yourself" title="Listen to a CD" icon="kscd.png" command="kscd" kde_command="kscd -caption \"%c\" %i %m" kde_opt="\\nBinaryPattern=kscd;\\nProtocols=\\nDocPath=kscd/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
 
+# Record sounds
+?package(gnome-media):needs="x11" command="/usr/bin/grecord" section="Entertain yourself" title="Record sounds" icon="/usr/share/pixmaps/gnome-grecord.png"
 
 
-## Music and Movies
-# gnome-media
-?package(gnome-media):needs="gnome" command="/usr/bin/gtcd" section="Music and Movies" title="Listen a musical CD" icon="/usr/share/pixmaps/gtcd.png"
-
-?package(gnome-media):needs="gnome" command="/usr/bin/grecord" section="Music and Movies" title="Record sounds" icon="/usr/share/pixmaps/gnome-grecord.png"
-
-
-# grip
-?package(grip):command="/usr/bin/grip" icon="grip.xpm" title="Create your musical CDs and MP3 using Grip" needs="x11" section="Music and Movies"
+# Rip cd
+?package(grip):command="/usr/bin/grip" icon="grip.png" title="Rip a CDs" needs="x11" section="Entertain yourself"
 
 
-# kdemultimedia
-?package(kdemultimedia-aktion): needs="kde" kde_filename="aktion" section="Music and Movies" title="Watch video" icon="aktion.png" command="aktion" kde_command="aktion %i %m -caption \"%c\"" mimetypes="video/x-msvideo,video/quicktime,video/x-flic" kde_opt="\\nDocPath=aktion/index.html\\nTerminal=0\\nServiceTypes=Browser/View\\nX-KDE-Library=libaktion\\nInitialPreference=5\\nKDE-X-StartupNotify=true"
+# Watch videos
+?package(xmovie): needs="x11" icon="xmovie.xpm" section="Entertain yourself" title="Watch videos" kde_opt="InitialPreference=10" mimetypes="video/x-msvideo;video/quicktime;video/x-flic;video/mpeg;video/x-mpeg" command="/usr/X11R6/bin/xmovie"
 
-?package(kdemultimedia): needs="x11" kde_filename="artsbuilder" section="Music and Movies" title="Create new structures of small connected modules for Arts" icon="arts.png" command="artsbuilder" mimetypes="application/x-artsbuilder" kde_opt="\\nBinaryPattern=artsbuilder;\\nProtocols=\\nTerminalOptions=\\nPath=\\nTerminal=0\\nDocPath=artsbuilder/index.html"
+# Watch TV
+?package(xawtv): command="XawTV" icon="xawtv.png" section="Entertain yourself" title="Watch TV" needs="x11"
 
-?package(kdemultimedia): needs="kde" kde_filename="kscd" section="Music and Movies" title="Listen a musical CD" icon="kscd.png" command="kscd" kde_command="kscd -caption \"%c\" %i %m" kde_opt="\\nBinaryPattern=kscd;\\nProtocols=\\nDocPath=kscd/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdemultimedia): needs="kde" kde_filename="noatun" section="Music and Movies" title="Listen to music using Noatun" icon="noatun.png" command="noatun" kde_command="noatun %i %m -caption \"%c\" %U" mimetypes="audio/x-mp3,audio/x-ogg,audio/x-mp2,video/mpeg,audio/x-mpegurl,audio/x-wav,audio/x-mod" multiple_files="true" accept_url="true" kde_opt="\\nDocPath=noatun/index.html\\nTerminal=0\\nInitialPreference=3\\nKDE-X-StartupNotify=false"
-
-?package(kdemultimedia): needs="x11" kde_filename="kmid" section="Music and Movies" title="Use a midi and karaoke Player" icon="kmid.png" command="kmid" kde_command="kmid %u" mimetypes="audio/x-karaoke,audio/x-midi,audio/midi" multiple_files="false" accept_url="true" kde_opt="\\nBinaryPattern=kmid;\\nProtocols=file;\\nTerminalOptions=\\nPath=\\nDocPath=kmid/index.html\\nTerminal=0\\nServiceTypes=Browser/View\\nX-KDE-Library=libkmidpart\\nKDE-X-StartupNotify=true"
-
-?package(kdemultimedia): needs="x11" kde_filename="kmidi" section="Music and Movies" title="Listen to midi files" icon="kmidi.png" command="kmidi" kde_command="kmidi %m %i %f" mimetypes="audio/x-midi,audio/x-karaoke" multiple_files="false" accept_url="false" kde_opt="\\nBinaryPattern=kmidi;\\nProtocols=file;ftp;http;tar;cgi;\\nDocPath=kmidi/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-
-# smpeg-player
-?package(smpeg-player): command="/usr/bin/gtv" needs="X11" icon="video_section.png" section="Music and Movies" title="Play mpeg video using Gtv"
-
-
-# XawTV
-?package(xawtv): command="XawTV" icon="xawtv.xpm" section="Music and Movies" title="Watch TV" needs="x11"
-
-
-# xmovie
-?package(xmovie): needs="X11" icon="xmovie.xpm" section="Music and Movies" title="Play videos using XMovie" kde_opt="InitialPreference=10" mimetypes="video/x-msvideo;video/quicktime;video/x-flic;video/mpeg;video/x-mpeg" command="/usr/X11R6/bin/xmovie"
-
-
-# xmms
-?package(xmms): needs="x11" section="Music and Movies" title="Listen to music using Xmms"  command="soundwrapper xmms" mimetypes="video/mpeg;audio/x-mp3;audio/x-ogg;audio/x-mpegurl;audio/x-wav" icon="xmms.xpm"
+# Listen to music files
+?package(xmms): needs="x11" section="Entertain yourself" title="Listen to musicfiles"  command="soundwrapper xmms" mimetypes="video/mpeg;audio/x-mp3;audio/x-ogg;audio/x-mpegurl;audio/x-wav" icon="xmms.xpm"
 
 
 
@@ -158,20 +90,14 @@
 # armagetron
 ?package(armagetron):command="/usr/games/armagetron" icon="armagetron.xpm" needs="x11" section="Play a game" title="Play ArmageTron, a 3D lightcycle game"
 
-
-# bzflag
-?package(bzflag):command="/usr/games/bzflag" icon="bzflag.xpm" needs="x11" section="Play a game" title="Play BZflag, a multiplayer 3D tank battle game"
+?package(frozen-bubble):command="/usr/bin/frozen-bubble" icon="frozen-bubble.png" needs="x11" section="Play a game" title="Play Frozen-Buggle"
 
 
 # chromium
 ?package(chromium):command="/usr/games/chromium" icon="chromium.xpm" needs="x11" section="Play a game" title="Play Chromium, a 3D shoot them up"
 
-?package(chromium-setup):command="/usr/games/chromium-setup" icon="chromium.xpm" needs="x11" section="Play a game" title="Configure Chromium"
-
-
 # csmach
-?package(csmash):command="/usr/bin/csmash" icon="csmash.xpm" needs="x11" section="Play a game" title="Play Cannon Smash, a 3D tabletennis game"
-
+?package(csmash):command="/usr/bin/csmash" icon="csmash.png" needs="x11" section="Play a game" title="Play Cannon Smash, a 3D tabletennis game"
 
 # freeciv
 ?package(freeciv):needs="x11" section="Play a game" title="Play Freeciv, the Free Civilization Clone" command="/usr/games/civclient" icon="freeciv-client.xpm"
@@ -179,252 +105,83 @@
 ?package(freeciv):needs="text" section="Play a game" title="Start Freeciv server" command="/usr/games/civserver" icon="freeciv-server.xpm"
 
 
-# gltron
-?package(gltron):command="/usr/games/gltron" icon="gltron.xpm" needs="x11" section="Play a game" title="Play Gltron, a 3D lightcycle game"
-
-
 # gnome-games
 ?package(gnome-games): title="Play FreeCell" command="/usr/bin/freecell" icon="gnome-cardgame.xpm" needs="gnome" section="Play a game"
 
 ?package(gnome-games): title="Play Gnome Mines" command="/usr/bin/gnomine" icon="gnome-gnomine.xpm" needs="gnome" section="Play a game"
 
-?package(gnome-games): title="Play Same Gnome" command="/usr/bin/same-gnome" icon="gnome-gsame.xpm" needs="gnome" section="Play a game"
-
 ?package(gnome-games): title="Play Mahjongg" command="/usr/bin/mahjongg" icon="gnome-mahjongg.xpm" needs="gnome" section="Play a game"
 
-?package(gnome-games): title="Play GTali" command="/usr/bin/gtali" icon="gnome-gtali.xpm" needs="gnome" section="Play a game"
-
-?package(gnome-games): title="Play Gnobots II" command="/usr/bin/gnobots2" icon="gnome-gnobots.xpm" needs="gnome" section="Play a game"
-
 ?package(gnome-games): icon="iagno.xpm" title="Play reversi" command="/usr/bin/iagno" needs="gnome" section="Play a game"
 
-?package(gnome-games): title="Play Gnotravex" command="/usr/bin/gnotravex" icon="gnome-gnotravex.xpm" needs="gnome" section="Play a game"
-
-?package(gnome-games): title="Play Gnome Stones" command="/usr/bin/gnome-stones" icon="gnome-stones.xpm" needs="gnome" section="Play a game"
-
 ?package(gnome-games): title="Play solitaire" command="/usr/bin/sol" icon="gnome-aisleriot.xpm" needs="gnome" section="Play a game"
 
-?package(gnome-games): title="Play Gnibbles" command="/usr/bin/gnibbles" icon="gnome-nibbles.xpm" needs="gnome" icon="gnome-nibbles.xpm" section="Play a game"
-
-?package(gnome-games): title="Play Glines" command="/usr/bin/glines" icon="glines.xpm" needs="gnome" section="Play a game"
-
-?package(gnome-games): icon="gataxx.xpm" title="Play Gataxx" command="/usr/bin/gataxx" needs="gnome" section="Play a game"
-
-?package(gnome-games): title="Play Gnome Klotski" command="/usr/bin/gnotski" needs="gnome" section="Play a game"
-
-
-# icebreaker
-?package(icebreaker):command="/usr/games/icebreaker" icon="icebreaker.xpm" needs="x11" section="Play a game" title="Play IceBreaker, an action-puzzle game involving bouncing penguins"
-
-
 # kdegames
 ?package(kdegames): needs="kde" kde_filename="kabalone" section="Play a game" title="Play Abalone" icon="kabalone.png" command="kabalone" kde_command="kabalone %i %m -caption \"%c\"" kde_opt="\\nDocPath=kabalone/index.html\\nKDE-X-StartupNotify=true"
 
 ?package(kdegames): needs="kde" kde_filename="kasteroids" section="Play a game" title="Play KAsteroids" icon="kasteroids.png" command="kasteroids" kde_command="kasteroids %i %m -caption \"%c\"" mimetypes="" kde_opt="\\nBinaryPattern=kasteroids;\\nTerminalOptions=\\nPath=\\nDocPath=kasteroids/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
-?package(kdegames): needs="x11" kde_filename="katomic" section="Play a game" icon="katomic.png" command="katomic" kde_command="katomic %i %m -caption \"%c\"" title="Build molecules in fewer moves possible" kde_opt="\\nDocPath=katomic/index.html\\nKDE-X-StartupNotify=true"
-
-?package(kdegames): needs="kde" kde_filename="kbackgammon" section="Play a game" icon="kbackgammon.png" command="kbackgammon" kde_command="kbackgammon %i %m -caption \"%c\"" title="Play Backgammon games offline against friends or online on FIBS" kde_opt="\\nDocPath=kbackgammon/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdegames): needs="kde" kde_filename="kbattleship" section="Play a game" icon="kbattleship.png" command="kbattleship" kde_command="kbattleship %i %m -caption \"%c\"" title="Battle the other's fleet" kde_opt="\\nDocPath=docs/en/index.html\\nTerminal=0"
-
-?package(kdegames): needs="kde" kde_filename="kblackbox" section="Play a game" icon="kblackbox.png" command="kblackbox" kde_command="kblackbox %i %m -caption \"%c\"" title="Play BlackBox, a little logical game" mimetypes="" kde_opt="\\nBinaryPattern=kblackbox;\\nProtocols=\\nTerminalOptions=\\nPath=\\nDocPath=kblackbox/index.html\\nExtensions=\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdegames): needs="kde" kde_filename="kfouleggs" section="Play a game" icon="kfouleggs.xpm" command="kfouleggs" kde_command="kfouleggs -caption \"%c\" %i %m" title="Play Foul Eggs, a game also known as Puyo Puyo" kde_opt="\\nDocPath=kfouleggs/index.html\\nKDE-X-StartupNotify=true"
-
-?package(kdegames): needs="kde" kde_filename="kjezz" section="Play a game" title="Play Jezzball" icon="kjezz.png" command="kjezz" kde_command="kjezz %i %m -caption \"%c\"" kde_opt="\\nDocPath=kjezz/index.html"
-
-?package(kdegames): needs="kde" kde_filename="kjumpingcube" section="Play a game" title="Play KJumpingCube, a tactical game" icon="kjumpingcube.png" command="kjumpingcube" kde_command="kjumpingcube -caption \"%c\" %i %m" kde_opt="\\nBinaryPattern=kjumpingcube;\\nDocPath=kjumpingcube/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdegames): needs="kde" kde_filename="klines" section="Play a game" title="Play Klines" icon="klines.png" command="klines" kde_command="klines -caption \"%c\" %i %m" kde_opt="\\nMiniIcon=klines.png\\nDocPath=klines/index.html\\nTerminal=0"
-
 ?package(kdegames): needs="kde" kde_filename="kmahjongg" section="Play a game" icon="kmahjongg.png" command="kmahjongg" kde_command="kmahjongg %i %m -caption \"%c\"" title="Play Mahjongg, a smart mahjongg game" kde_opt="\\nDocPath=kmahjongg/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
 ?package(kdegames): needs="kde" kde_filename="kmines" section="Play a game" icon="kmines.png" command="kmines" kde_command="kmines -caption \"%c\" %i %m" title="Play Minesweeper, a KDE replacement for xbombs" kde_opt="\\nDocPath=kmines/index.html\\nKDE-X-StartupNotify=true"
 
-?package(kdegames): needs="kde" kde_filename="konquest" section="Play a game" icon="konquest.png" command="konquest" kde_command="konquest %i %m -caption %c" title="Play Konsquest, a game of galactic conquest" kde_opt="\\nTerminal=0\\nDocPath=konquest/index.html\\nKDE-X-StartupNotify=true"
-
 ?package(kdegames): needs="kde" kde_filename="kpat" section="Play a game" icon="kpat.png" command="kpat" kde_command="kpat %i %m -caption \"%c\"" title="Play Kpat, several nice card games" kde_opt="\\nDocPath=kpat/index.html"
 
 ?package(kdegames): needs="kde" kde_filename="kpoker" section="Play a game" title="Play Poker" icon="kpoker.png" command="kpoker" kde_command="kpoker %i %m -caption \"%c\"" kde_opt="\\nMiniicon=kpoker.png\\nDocPath=kpoker/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
 ?package(kdegames): needs="kde" kde_filename="kreversi" section="Play a game" icon="kreversi.png" command="kreversi" kde_command="kreversi %i %m -caption \"%c\"" title="Play Reversi against the computer" kde_opt="\\nDocPath=kreversi/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
-?package(kdegames): needs="kde" kde_filename="ksame" section="Play a game" title="Play SameGame" icon="ksame.png" command="ksame" kde_command="ksame %i %m -caption \"%c\"" kde_opt="\\nDocPath=ksame/index.html\\nKDE-X-StartupNotify=true"
-
-?package(kdegames): needs="kde" kde_filename="kshisen" section="Play a game" icon="kshisen.png" command="kshisen" kde_command="kshisen %i %m -caption \"%c\"" title="Play Shisen-Sho, a game similar to Mahjongg" kde_opt="\\nDocPath=kshisen/index.html\\nKDE-X-StartupNotify=true"
-
 ?package(kdegames): needs="kde" kde_filename="ksirtet" section="Play a game" icon="ksirtet.png" command="ksirtet" kde_command="ksirtet -caption \"%c\" %i %m" title="Play KSirtet, a Tetris clone" kde_opt="\\nDocPath=ksirtet/index.html\\nKDE-X-StartupNotify=true"
 
-?package(kdegames): needs="kde" kde_filename="ksmiletris" section="Play a game" icon="ksmiletris.png" command="ksmiletris" kde_command="ksmiletris -caption \"%c\" %i %m" title="Play KSmiletris, a Tetris-like game" mimetypes="" kde_opt="\\nBinaryPattern=ksmiletris;\\nProtocols=\\nTerminalOptions=\\nPath=\\nDocPath=ksmiletris/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdegames): needs="kde" kde_filename="ksnake" section="Play a game" icon="ksnake.png" command="ksnake" kde_command="ksnake %i %m -caption \"%c\"" title="Eat all items before the computer" kde_opt="\\nDocPath=ksnake/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdegames): needs="kde" kde_filename="ksokoban" section="Play a game" icon="ksokoban.png" command="ksokoban" kde_command="ksokoban %i %m -caption \"%c\"" title="Play KSokoban, the japanese warehouse keeper game" kde_opt="\\nDocPath=ksokoban/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdegames): needs="kde" kde_filename="kspaceduel" section="Play a game" title="SpaceDuel" icon="kspaceduel.png" command="kspaceduel" kde_command="kspaceduel %i %m -caption \"%c\"" mimetypes="" kde_opt="\\nSwallowExec=\\nSwallowTitle=\\nBinaryPattern=kspaceduel;\\nTerminalOptions=\\nPath=\\nDocPath=kspaceduel/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdegames): needs="kde" kde_filename="ktron" section="Play a game" icon="ktron.png" command="ktron" kde_command="ktron -caption \"%c\" %i %m" title="Play KTron, a race in the hyperspace" kde_opt="\\nDocPath=ktron/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdegames): needs="kde" kde_filename="kwin4" section="Play a game" title="Play KWin4" icon="kwin4.png" command="kwin4" mimetypes="" kde_opt="\\nSwallowExec=\\nSwallowTitle=\\nTerminal=0\\nTerminalOptions=\\nX-KDE-SubstituteUID=0\\nX-KDE-Username=\\nDocPath=kwin4/index.html"
-
-?package(kdegames): needs="kde" kde_filename="lskat" section="Play a game" title="Play Lieutnant Skat" icon="lskat.png" command="lskat" kde_opt="\\nTerminal=0\\nDocPath=lskat/index.html\\nKDE-X-StartupNotify=true"
-
 
 # Maelstrom
-?package(Maelstrom):command="/usr/bin/Maelstrom" title="Play Maelstrom, an asteroids game" needs="x11" icon="Maelstrom.xpm" section="Play a game"
-
-
-# mures
-?package(mures):command="/usr/bin/mures" icon="mures.xpm" needs="x11" section="Play a game" title="Play Mures, a clone of Sega's Chu Chu Rocket"
-
-
-# penguin-command
-?package(penguin-command):command="/usr/games/penguin-command" icon="penguin-command.xpm" needs="x11" section="Play a game" title="Play Penguin Command, a clone of the classic Missile Command game"
-
-
-# pysol
-?package(pysol): needs="gnome" section="Play a game" command="NO_XALF pysol" icon="cards_section.png" title="Play all solitaire cards games"
-
-?package(pysol): needs="kde" section="Play a game" command="pysol" icon="cards_section.png" title="Play all solitaire cards games"
-
-
-# rocksndiamonds
-?package(rocksndiamonds):command="/usr/games/rocksndiamonds" icon="rocksndiamonds.xpm" needs="x11" section="Play a game" title="Play Rocks n Diamonds, a boulderdash like"
-
+?package(Maelstrom):command="/usr/bin/Maelstrom" title="Play Maelstrom, an asteroids game" needs="x11" icon="Maelstrom.png" section="Play a game"
 
+#TuxRacer
 ?package(tuxracer):command="tuxracer" icon="tuxracer.xpm" needs="x11" section="Play a game" title="Play Tuxracer, a great racing game starring Tux"
 
-
-# xrally
-?package(xrally): needs="x11" section="Play a game" title="Play XRally, a clone of the Rally X arcade game" icon="xrally.xpm" command="xrally"
-
-
-# xscavenger
-?package(xscavenger):command="/usr/games/scavenger" icon="xscavenger.xpm" needs="x11" section="Play a game" title="Play X-Scavenger, an arcade, thinking game very much like Lode Runner"
-
-
-# xsoldier
-?package(xsoldier): needs="X11" section="Play a game" title="Play XSoldier, a shoot'em up game" command="/usr/games/xsoldier" icon="xsoldier.xpm"
-
-
+#Pingus
+?package(pingus):command="Pingus" icon="pingus.png" needs="x11" section="Play a game" title="Play Pingus, a Lemmings clone"
 
 
 ## Use the Internet
-# bluefish
-?package(bluefish): command="bluefish" icon="bluefish.xpm" needs="x11" title="Create Web pages using BlueFish" section="Use the Internet"
-
-# everybuddy
-?package(everybuddy):command="/usr/bin/everybuddy" icon="everybuddy.xpm" title="Dialog using a universal instant messaging client" needs="x11" section="Use the Internet"
-
-
-# evolution
-?package(evolution):command="evolution" icon="evolution.xpm" needs="X11" section="Use the Internet" title="Read and send mail using Evolution"
-
-# gabber
-?package(gabber): needs="x11" section="Use the Internet" title="Use a Jabber instant messaging system" command="/usr/bin/gabber" icon="gabber.xpm"
-
-
-# gaim
-?package(gaim): command="/usr/bin/gaim" needs="X11" icon="gaim.xpm" section="Use the Internet" title="Dialog using Kit, an AOL instant messenger client"
-
-
-# galeon
-?package(galeon): command="/usr/bin/galeon" icon="galeon.xpm" needs="x11" section="Use the Internet" title="Browse the Web using Galeon"
-
-
-# gftp
-?package(gftp):needs="x11" section="Use the Internet" title="Transfer files using gFTP" command="/usr/bin/gftp" icon="gftp.xpm"
-
-
-# gnomeicu
-?package(gnomeicu):needs="gnome" section="Use the Internet" title="Dialog on ICQ using GnomeICU" command="gnomeicu -a" icon="gnomeicu.xpm"
+# HTML Editor
+?package(mozilla):icon="mozilla.xpm" needs="gnome" section="Use the Internet" title="Create Web pages" command="NO_XALF /usr/bin/mozilla --editor"
+?package(quanta): needs="kde" kde_filename="quanta" section="Use the Internet" title="Create Web pages" icon="quanta.png" command="quanta" mimetypes="text/html" kde_opt=""
 
 
-# gnomenetwork
-?package(gnome-network): title="Connect to the Internet using gnome-ppp" command="/usr/bin/gnome-ppp" icon="gnome-networktool.xpm" needs="gnome" section="Use the Internet"
+# Mail client
+?package(evolution):command="evolution" icon="evolution.png" needs="gnome" section="Use the Internet" title="Read and send mail"
+?package(kdenetwork): needs="kde" kde_filename="KMail" section="Use the Internet" title="Read and send mail" icon="kmail.png" command="kmail" kde_command="kmail -caption \"%c\" %i %m" kde_opt="\\nDocPath=kmail/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
 
-# gtm
-?package(gtm):needs="x11" section="Use the Internet" title="Transfer files using Gtm" command="/usr/bin/gtm" icon="gtm.xpm"
-
-
-# kdebase
-?package(kdebase): needs="gnome" kde_filename="konqbrowser" section="Use the Internet" title="Browse the Web using Konqueror" icon="konqueror.png" command="NO_XALF kfmclient openProfile webbrowsing" kde_opt="\\nDocPath=konqueror/index.html"
-
-?package(kdebase): needs="x11" kde_filename="konqbrowser" section="Use the Internet" title="Browse the Web using Konqueror" icon="konqueror.png" command="kfmclient openProfile webbrowsing" kde_opt="\\nDocPath=konqueror/index.html"
-
+# Web browser
+?package(webclient): command="/usr/bin/webclient-gnome" icon="networking_www_section.png" needs="gnome" section="Use the Internet" title="Browse the Web"
+?package(webclient): command="/usr/bin/webclient-kde" icon="networking_www_section.png" needs="kde" section="Use the Internet" title="Browse the Web"
+#needed for konqueror
 ?package(kdebase): needs="kde" kde_filename="kfmclient_html" section="Use the Internet" title="Konqueror" icon="konqueror.png" command="kfmclient openURL %u text/html" mimetypes="text/html" kde_opt="\\nTerminal=0\\nInitialPreference=9\\nNoDisplay=true"
 
-?package(kdebase): needs="x11" kde_filename="keditbookmarks" section="Use the Internet" title="Manage your Konqueror bookmarks" icon="keditbookmarks.png" command="keditbookmarks" kde_opt="\\nX-KDE-StartupNotify=true"
-
-
-# kdenetwork
-?package(kdenetwork): needs="kde" kde_filename="kit" section="Use the Internet" title="Dialog using Kit, an AOL instant messenger client" icon="kit.png" command="kit" mimetypes="" kde_opt="\\nBinaryPattern=kit;\\nProtocols=\\nDocPath=kit/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdenetwork): needs="kde" kde_filename="ksirc" section="Use the Internet" title="Dialog on IRC using KSirc" icon="ksirc.png" command="ksirc" kde_command="ksirc %i %m" mimetypes="" kde_opt="\\nSwallowExec=\\nBinaryPattern=\\nTerminalOptions=\\nPath=\\nTerminal=0\\nMapNotify=true"
-
-?package(kdenetwork): needs="x11" kde_filename="KMail" section="Use the Internet" title="Read and send mail using KMail" icon="kmail.png" command="kmail" kde_command="kmail -caption \"%c\" %i %m" kde_opt="\\nDocPath=kmail/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdenetwork): needs="x11" kde_filename="KNode" section="Use the Internet" title="Read and send news using KNode" icon="knode.png" command="knode" kde_command="knode -caption \"%c\" %i %m" kde_opt="\\nDocPath=knode/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdenetwork): needs="x11" kde_filename="Kppp" section="Use the Internet" title="Connect to the Internet using Kppp" icon="kppp.png" command="kppp" kde_command="kppp %i %m" mimetypes="" kde_opt="\\nBinaryPattern=kppp;\\nProtocols=\\nDocPath=kppp/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
-
-?package(kdenetwork): needs="x11" kde_filename="kppplogview" section="Use the Internet" title="Show Kppp logfiles" icon="kppp.png" command="kppplogview" mimetypes="" kde_opt="\\nBinaryPattern=kppplogview;\\nProtocols=\\nTerminalOptions=\\nPath=\\nTerminal="
-
 
-# kvirc
-?package(kvirc): needs="x11" kde_filename="kvirc" section="Use the Internet" title="Dialog on IRC using KVIrc" icon="kvirc.xpm" command="kvirc" kde_opt="\\nTerminal=0"
+# Newsgroups
+?package(kdenetwork): needs="kde" kde_filename="KNode" section="Use the Internet" title="Access Newsgroups" icon="knode.png" command="knode" kde_command="knode -caption \"%c\" %i %m" kde_opt="\\nDocPath=knode/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
+?package(pan):command="/usr/bin/pan" needs="gnome" icon="pan.png" section="Use the Internet" title="Access Newsgroups"
 
+# Connect to the Internet
+?package(gnome-network): title="Connect to the Internet" command="/usr/bin/gnome-ppp" icon="gnome-networktool.xpm" needs="gnome" section="Use the Internet"
+?package(kdenetwork): needs="x11" kde_filename="Kppp" section="Use the Internet" title="Connect to the Internet" icon="kppp.png" command="kppp" kde_command="kppp %i %m" mimetypes="" kde_opt="\\nBinaryPattern=kppp;\\nProtocols=\\nDocPath=kppp/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
-# licq
-?package(licq):command="NO_XALF licq" icon="licq.xpm" title="Dialog on ICQ using Licq" needs="gnome" section="Use the Internet"
-
-?package(licq):command="licq"icon="licq.xpm" title="Dialog on ICQ using Licq" needs="x11" section="Use the Internet"
-
-
-# mozilla
-?package(mozilla): icon="mozilla.xpm" needs="gnome" section="Use the Internet" title="Browse the Web using Mozilla" command="NO_XALF /usr/bin/mozilla"
-
-?package(mozilla): icon="mozilla.xpm" needs="kde" section="Use the Internet" title="Browse the Web using Mozilla" command="/usr/bin/mozilla"
-
-?package(mozilla-mail):icon="mozilla.xpm" needs="gnome" section="Use the Internet" title="Send and read mail and news using Mozilla" command="NO_XALF /usr/bin/mozilla -mail"
-
-?package(mozilla-mail):icon="mozilla.xpm" needs="x11" section="Use the Internet" title="Send and read mail and news using Mozilla" command="/usr/bin/mozilla -mail"
-
-
-# netscape-communicator
-?package(netscape-communicator): needs="x11" section="Use the Internet" title="Browse the Web using Netscape Communicator" icon="communicator-browser.xpm" command="/usr/bin/netscape"
-
-?package(netscape-communicator): needs="x11" section="Use the Internet" title="Create Web pages using Netscape Composer" command="/usr/bin/netscape +composer" icon="communicator-composer.xpm"
-
-?package(netscape-communicator): needs="x11" section="Use the Internet" title="Read and send news using Netscape Collabra" command="/usr/bin/netscape +discussions" icon="communicator-discussion.xpm"
-
-?package(netscape-communicator): needs="x11" section="Use the Internet" title="Read and send mail using Netscape Messenger" command="/usr/bin/netscape +messenger" icon="communicator-mail.xpm"
-
-
-# netscape-navigator
-?package(netscape-navigator):needs="x11" section="Use the Internet" title="Browse the Web using Netscape Navigator" icon="netscape.xpm" command="/usr/bin/netscape"
-
-
-# pan
-?package(pan):command="/usr/bin/pan" needs="X11" icon="pan.xpm" section="Use the Internet" title="Read and send news using News"
-
-
-# quanta
-?package(quanta): needs="x11" kde_filename="quanta" section="Use the Internet" title="Create Web pages using Quanta" icon="quanta.png" command="quanta" mimetypes="text/html" kde_opt=""
-
-
-# screem
-?package(screem):command="/usr/bin/screem" icon="screem.xpm" title="Create Web pages using Screem" needs="X11" section="Use the Internet"
-
-
-# xchat
-?package(xchat):needs="x11" section="Use the Internet" title="Dialog on IRC using XChat" command="xchat" icon="xchat.xpm"
-
+# Dialog on IRC
+?package(kdenetwork): needs="kde" kde_filename="ksirc" section="Use the Internet" title="Dialog on IRC" icon="ksirc.png" command="ksirc" kde_command="ksirc %i %m" mimetypes="" kde_opt="\\nSwallowExec=\\nBinaryPattern=\\nTerminalOptions=\\nPath=\\nTerminal=0\\nMapNotify=true"
+?package(xchat):needs="gnome" section="Use the Internet" title="Dialog on IRC" command="xchat" icon="xchat.xpm"
 
 
+# ICQ
+?package(gnomeicu):needs="gnome" section="Use the Internet" title="Dialog using an ICQ instant messager client" command="gnomeicu -a" icon="gnomeicu.xpm"
+?package(licq):command="licq"icon="licq.xpm" title="Dialog using an ICQ instant messager client" needs="kde" section="Use the Internet"
 
+# AOL
+?package(gaim):command="gaim" icon="gaim.xpm" title="Dialog using an AOL instant messager client" needs="gnome" section="Use the Internet"
+?package(kdenetwork): needs="kde" kde_filename="kit" section="Use the Internet" title="Dialog using an AOL instant messager client" icon="kit.png" command="kit" mimetypes="" kde_opt="\\nBinaryPattern=kit;\\nProtocols=\\nDocPath=kit/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
 ## Read documentation
 # gnome-core
@@ -485,141 +242,55 @@
 ?package(kdebase): needs="kde" kde_filename="ktip" section="Read documentation" title="Read KDE tips" icon="ktip.png" command="ktip" kde_opt="\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-KDE-autostart-after=kdesktop\\nX-KDE-autostart-condition=kdewizardrc:General:TipsOnStart:false"
 
 
+## Use office tools
+# Text processor
+?package(abiword): command="/usr/bin/abiword" section="Use office tools" icon="abiword.png" needs="gnome" title="Create a text document"
+?package(koffice): needs="kde" kde_filename="kword" section="Use office tools" title="Create a text document" icon="kword.png" command="kword" mimetypes="application/x-kword" kde_opt="\\nX-KDE-Library=libkwordpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart,text/plain,application/x-kword-crypt\\nX-KDE-NativeMimeType=application/x-kword\\nDocPath=kword/index.html\\nKDE-X-StartupNotify=true"
 
+# Spreadsheets
+?package(gnumeric): command="/usr/bin/gnumeric" needs="gnome" icon="gnumeric.png" section="Use office tools" title="Create spreadsheets using Gnumeric"
+?package(koffice): needs="kde" kde_filename="kspread" section="Use office tools" title="Create spreadsheets" icon="kspread.png" command="kspread" mimetypes="application/x-kspread" kde_opt="\\nX-KDE-Library=libkspreadpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart,text/x-csv,application/x-kspread-crypt,application/x-quattropro\\nX-KDE-NativeMimeType=application/x-kspread\\nX-DCOP-ServiceType=multi\\nDocPath=kspread/index.html\\nKDE-X-StartupNotify=true"
 
 
-## Use office tools (Create an office document)
-# abiword
-?package(abiword): command="/usr/bin/abiword" section="Use office tools (Create an office document)" icon="abiword.xpm" needs="x11" title="Create a text document using AbiWord"
-
-
-# dia
-?package(dia): needs="x11" section="Use office tools (Create an office document)" title="Create diagrams using Dia" command="/usr/bin/dia" icon="dia.xpm"
-
+# Diagrams
+?package(dia): needs="gnome" section="Use office tools" title="Create flowcharts and diagrams" command="/usr/bin/dia" icon="dia.xpm"
+?package(koffice): needs="kde" kde_filename="kivio" section="Use office tools" title="Create flowcharts and diagrams" icon="kivio.png" command="kivio" mimetypes="application/x-kivio" kde_opt="\\nX-KDE-Library=libkiviopart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart\\nX-KDE-NativeMimeType=application/x-kivio"
 
-# gnome-utils
-?package(gnome-utils):needs="X11" section="Use office tools (Create an office document)" title="Manage workflow and keep track of the time you spend on projects" command="/usr/bin/gtt" icon="gnome-cromagnon.xpm"
+#presentation
+?package(koffice): needs="x11" kde_filename="kpresenter" section="Use office tools" title="Create a presentation" icon="kpresenter.png" command="kpresenter" mimetypes="application/x-kpresenter" kde_opt="\\nX-KDE-Library=libkpresenterpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart\\nX-KDE-NativeMimeType=application/x-kpresenter\\nX-DCOP-ServiceType=multi\\nDocPath=kpresenter/index.html\\nKDE-X-StartupNotify=true"
 
 
-# gnumeric
-?package(gnumeric): command="/usr/bin/gnumeric" needs="x11" icon="gnumeric.xpm" section="Use office tools (Create an office document)" title="Create spreadsheets using Gnumeric"
-
-
-# kdebase
-?package(kdebase): needs="kde" kde_filename="kaddressbook" section="Use office tools (Create an office document)" title="Use KDE addressbook" icon="addressbook_section.png" command="kaddressbook" kde_opt="\\nDocPath=kaddressbook/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true"
-
-?package(kdebase): needs="kde" kde_filename="kdeprintfax" section="Use office tools (Create an office document)" title="Send a fax" icon="kdeprintfax.png" command="kdeprintfax %u" kde_command="kdeprintfax -caption \"%c\" %i %m %u" kde_opt="\\nMiniIcon=kdeprintfax\\nTerminal=0"
-   
-
-# kdegraphics
-?package(kdegraphics): needs="x11" kde_filename="kghostview" section="Use office tools (Create an office document)" title="View PostScript or PDF documents" icon="kghostview.png" command="kghostview" kde_command="kghostview %u -caption \"%c\" %i %m" mimetypes="application/pdf,application/postscript,image/x-eps,application/gzpostscript" multiple_files="false" accept_url="true" kde_opt="\\nInitialPreference=6\\nDocPath=kghostview/index.html\\nTerminal=0\\nCaption=PS Viewer\\nServiceTypes=KParts/ReadOnlyPart,Browser/View\\nX-KDE-Library=libkghostview\\nKDE-X-StartupNotify=true"
-
-?package(kdegraphics):needs="x11" kde_filename="kdvi" section="Use office tools (Create an office document)" title="View DVI documents" icon="kdvi.png" command="kviewshell dvi" kde_command="kviewshell dvi %f -caption \"%c\" %i %m " mimetypes="application/x-dvi" multiple_files="false" accept_url="false" kde_opt="\\nBinaryPattern=kdvi;\\nInitialPreference=6\\nTerminalOptions=\\nPath=\\nTerminal=0\\nServiceTypes=Browser/View\\nX-KDE-Library=libkviewerpart\\nX-KDE-BrowserView-Args=dvi\\nDocPath=kdvi/index.html\\nKDE-X-StartupNotify=true"
-
-
-# Klyx
-?package(klyx): needs="x11" kde_filename="klyx" section="Use office tools (Create an office document)" title="Create text document(s) using KLyx" icon="klyx.xpm" command="klyx" mimetypes="" kde_opt="\\nTerminalOptions=\\nPath=\\nProtocols=\\nTerminal=0\\nMapNotify=true"
-
-
-# Koffice
-?package(koffice): needs="x11" kde_filename="kchart" section="Use office tools (Create an office document)" title="Create a diagram using KChart" icon="kchart.png" command="kchart" mimetypes="application/x-kchart" kde_opt="\\nX-KDE-Library=libkchartpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart,KOfficeChart\\nX-KDE-NativeMimeType=application/x-kchart\\nKDE-X-StartupNotify=true"
-
-?package(koffice): needs="x11" kde_filename="kformula" section="Use office tools (Create an office document)" title="Create mathematics formula using KFormula" icon="kformula.png" command="kformula" mimetypes="application/x-kformula" kde_opt="\\nX-KDE-Library=libkformulapart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart\\nX-KDE-NativeMimeType=application/x-kformula"
-
-?package(koffice): needs="x11" kde_filename="kivio" section="Use office tools (Create an office document)" title="Create flowcharts and diagrams using Kivio" icon="kivio.png" command="kivio" mimetypes="application/x-kivio" kde_opt="\\nX-KDE-Library=libkiviopart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart\\nX-KDE-NativeMimeType=application/x-kivio"
-
-?package(koffice): needs="x11" kde_filename="koshell" section="Use office tools (Create an office document)" title="Use KOffice workspace" icon="kword.png" command="koshell" kde_opt="\\nDocPath=koshell/index.html\\nKDE-X-StartupNotify=true"
-
-?package(koffice): needs="x11" kde_filename="kpresenter" section="Use office tools (Create an office document)" title="Create a presentation using KPresenter" icon="kpresenter.png" command="kpresenter" mimetypes="application/x-kpresenter" kde_opt="\\nX-KDE-Library=libkpresenterpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart\\nX-KDE-NativeMimeType=application/x-kpresenter\\nX-DCOP-ServiceType=multi\\nDocPath=kpresenter/index.html\\nKDE-X-StartupNotify=true"
-
-?package(koffice): needs="x11" kde_filename="kspread" section="Use office tools (Create an office document)" title="Create spreadsheets using KSpread" icon="kspread.png" command="kspread" mimetypes="application/x-kspread" kde_opt="\\nX-KDE-Library=libkspreadpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart,text/x-csv,application/x-kspread-crypt,application/x-quattropro\\nX-KDE-NativeMimeType=application/x-kspread\\nX-DCOP-ServiceType=multi\\nDocPath=kspread/index.html\\nKDE-X-StartupNotify=true"
-
-#?package(koffice): needs="x11" kde_filename="kugar" section="Use office tools (Create an office document)" title="Create a report using Kugar" icon="kugar.png" command="kugar" mimetypes="application/x-kugar" kde_opt="\\nDocPath=\\nTerminal=0\\nServiceTypes=KParts/ReadOnlyPart,Browser/View\\nX-KDE-Library=libkugarpart"
-
-?package(koffice): needs="x11" kde_filename="kword" section="Use office tools (Create an office document)" title="Create a text document using KWord" icon="kword.png" command="kword" mimetypes="application/x-kword" kde_opt="\\nX-KDE-Library=libkwordpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart,text/plain,application/x-kword-crypt\\nX-KDE-NativeMimeType=application/x-kword\\nDocPath=kword/index.html\\nKDE-X-StartupNotify=true"
-
-
-# qcad
-?package(qcad): needs="x11" section="Use office tools (Create an office document)" title="Create 2D CAD documents" command="/usr/bin/qcad" icon="qcad.xpm"
-
+# Fax 
+?package(kdebase): needs="kde" kde_filename="kdeprintfax" section="Use office tools" title="Send a fax" icon="kdeprintfax.png" command="kdeprintfax %u" kde_command="kdeprintfax -caption \"%c\" %i %m %u" kde_opt="\\nMiniIcon=kdeprintfax\\nTerminal=0"
+?package(gfax): needs="kde" kde_filename="kdeprintfax" section="Use office tools" title="Send a fax" icon="kdeprintfax.png" command="kdeprintfax %u" kde_command="kdeprintfax -caption \"%c\" %i %m %u" kde_opt="\\nMiniIcon=kdeprintfax\\nTerminal=0"
 
 # StarOffice
-?package(staroffice-de): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="/usr/lib/office52_de/program/soffice" section="Use office tools (Create an office document)" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
-
-?package(staroffice-de): title="Configure your printer for StarOffice" icon=psetup.xpm needs="x11" command="/usr/lib/office52_de/program/spadmin" section="Use office tools (Create an office document)"
-
-?package(staroffice-de): title="StarOffice Setup" icon=set32.xpm needs="x11" command="/usr/lib/office52_de/program/setup" section="Use office tools (Create an office document)"
-
-
-?package(staroffice-en): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="/usr/lib/office52_en/program/soffice" section="Use office tools (Create an office document)" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
-
-?package(staroffice-en): title="Configure your printer for StarOffice" icon=psetup.xpm needs="x11" command="/usr/lib/office52_en/program/spadmin" section="Use office tools (Create an office document)"
+?package(staroffice-de): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
-?package(staroffice-en): title="StarOffice Setup" icon=set52.xpm needs="x11" command="/usr/lib/office52_en/program/setup" section="Use office tools (Create an office document)"
-
-
-?package(staroffice-es): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="/usr/lib/office52_es/program/soffice" section="Use office tools (Create an office document)" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
-
-?package(staroffice-es): title="Configure your printer for StarOffice" icon=psetup.xpm needs="x11" command="/usr/lib/office52_es/program/spadmin" section="Use office tools (Create an office document)"
-
-?package(staroffice-es): title="StarOffice Setup" icon=set52.xpm needs="x11" command="/usr/lib/office52_es/program/setup" section="Use office tools (Create an office document)"
-
-
-?package(staroffice-fr): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="/usr/lib/office52_fr/program/soffice" section="Use office tools (Create an office document)" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
-
-?package(staroffice-fr): title="Configure your printer for StarOffice" icon=psetup.xpm needs="x11" command="/usr/lib/office52_fr/program/spadmin" section="Use office tools (Create an office document)"
-
-?package(staroffice-fr): title="StarOffice Setup" icon=set52.xpm needs="x11" command="/usr/lib/office52_fr/program/setup" section="Use office tools (Create an office document)"
-
-
-?package(staroffice-es): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="/usr/lib/office52_es/program/soffice" section="Use office tools (Create an office document)" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
-
-?package(staroffice-es): title="Configure your printer for StarOffice" icon=psetup.xpm needs="x11" command="/usr/lib/office52_es/program/spadmin" section="Use office tools (Create an office document)"
-
-?package(staroffice-es): title="StarOffice Setup" icon=set52.xpm needs="x11" command="/usr/lib/office52_es/program/setup" section="Use office tools (Create an office document)"
+?package(staroffice-en): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
+?package(staroffice-es): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
+?package(staroffice-fr): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
+?package(staroffice-it): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
 
 ## View, modify or create a picture
-# ee
-?package(ee):needs="x11" section="View, modify or create a picture" title="View image(s) using Electric Eyes" command="/usr/bin/ee" icon="ee.xpm" mimetypes="image/gif;image/jpeg;image/png;image/tiff;image/x-xbm;image/x-xpm;"
-
 
-# Gimp
-?package(gimp): command="gimp" icon="wilbur.xpm" section="View, modify or create a picture" title="View, modify or create a picture using The GIMP" needs="x11" mimetypes="image/gif;image/jpeg;image/png;image/tiff;image/x-xbm;image/x-xpm;image/bmp;image/fits;image/pcx;image/pix;image/pnm;"
+# Manipulate pictures
+?package(gimp): command="gimp" icon="wilbur.png" section="View, modify or create a picture" title="Manipulate pictures" needs="x11" mimetypes="image/gif;image/jpeg;image/png;image/tiff;image/x-xbm;image/x-xpm;image/bmp;image/fits;image/pcx;image/pix;image/pnm;"
 
+# Take a screenshot
+?package(kdegraphics): needs="kde" kde_filename="ksnapshot" section="View, modify or create a picture" title="Take a screenshot" icon="ksnapshot.png" command="ksnapshot" kde_command="ksnapshot %i %m" mimetypes="" kde_opt="\\nBinaryPattern=\\nTerminalOptions=\\nPath=\\nTerminal=0\\nDocPath=ksnapshot/index.html\\nKDE-X-StartupNotify=true"
+?package(gnome-core): needs="gnome" section="View, modify or create a picture" title="Take a screenshot" icon="ksnapshot.png" command="gnome-panel-screenshot"
 
-# gqview
-?package(gqview):command="/usr/bin/gqview" icon="gqview.xpm" title="View image(s) using Gqview" needs="x11" section="View, modify or create a picture"
-
-
-# kdegraphics
-?package(kdegraphics): needs="x11" kde_filename="ksnapshot" section="View, modify or create a picture" title="Take a screenshot" icon="ksnapshot.png" command="ksnapshot" kde_command="ksnapshot %i %m" mimetypes="" kde_opt="\\nBinaryPattern=\\nTerminalOptions=\\nPath=\\nTerminal=0\\nDocPath=ksnapshot/index.html\\nKDE-X-StartupNotify=true"
-
-?package(kdegraphics): needs="kde" kde_filename="kcolorchooser" section="View, modify or create a picture" title="Choose a color" icon="kcoloredit.png" command="kcolorchooser" kde_command="kcolorchooser %i %m" kde_opt="\\nTerminalOptions=\\nPath=\\nTerminal=0\\nBinaryPattern=kcolorchooser\\nDocPath=kcolorchooser/kcolorchooser.html"
-
-?package(kdegraphics): needs="kde" kde_filename="kcoloredit" section="View, modify or create a picture" title="Use palette Editor" icon="kcoloredit.png" command="kcoloredit" kde_command="kcoloredit %i %m %U" multiple_files="true" accept_url="true" kde_opt="\\nTerminalOptions=\\nPath=\\nTerminal=0\\nBinaryPattern=kcoloredit\\nDocPath=kcoloredit/kcoloredit.html"
-
-?package(kdegraphics): needs="x11" kde_filename="kview" section="View, modify or create a picture" title="View image(s) using KView" icon="kview.png" command="kview" kde_command="kview %i %m %U" mimetypes="image/gif,image/x-xpm,image/x-xbm,image/jpeg,image/bmp,image/png,image/x-png,image/x-ico,image/tiff,video/x-mng" multiple_files="true" accept_url="true" kde_opt="\\nTerminalOptions=\\nPath=\\nDocPath=kview/index.html\\nTerminal=0\\nBinaryPattern=kview;\\nServiceTypes=KParts/ReadOnlyPart,Browser/View\\nInitialPreference=3\\nX-KDE-Library=libkviewpart\\nKDE-X-StartupNotify=true"
-
-?package(kdegraphics): needs="x11" kde_filename="kooka" section="View, modify or create a picture" title="Acquire images using a scanner" icon="scanner.png" command="kooka" kde_command="kooka %i %m %U" multiple_files="true" accept_url="true" kde_opt="\\nTerminalOptions=\\nPath=\\nTerminal=0\\nBinaryPattern=kooka\\nDocPath=kooka/kooka.html"
+# Image acquisition
+?package(kdegraphics): needs="gnome" section="View, modify or create a picture" title="Acquire images using a scanner" icon="/usr/share/icons/hicolor/48x48/devices/scanner.png" command="kooka" multiple_files="true" accept_url="true" 
+?package(kdegraphics): needs="kde" kde_filename="kooka" section="View, modify or create a picture" title="Acquire images using a scanner" icon="scanner.png" command="kooka" kde_command="kooka %i %m %U" multiple_files="true" accept_url="true" kde_opt="\\nTerminalOptions=\\nPath=\\nTerminal=0\\nBinaryPattern=kooka\\nDocPath=kooka/kooka.html"
 
 
 # Koffice
-?package(koffice): needs="x11" kde_filename="kontour" section="View, modify or create a picture" title="Design illustrations for papers or slides" icon="kontour.png" command="kontour" mimetypes="application/x-kontour" kde_opt="\\nX-KDE-Library=libkontourpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart\\nX-KDE-NativeMimeType=application/x-kontour\\nDocPath=kontour/index.html\\nKDE-X-StartupNotify=true"
-
-
-# Sketch
-?package(sketch): needs="gnome" icon="graphics_section.png" section="View, modify or create a picture" title="Create vector based draws using Sketch" command="NO_XALF /usr/bin/sketch"
-
-?package(sketch): needs="X11" icon="graphics_section.png" section="View, modify or create a picture" title="Create vector based draws using Sketch" command="/usr/bin/sketch"
-
-
-# xfig
-?package(xfig): title="Create vector based draws using XFig" command="/usr/X11R6/bin/xfig" icon="xfig.xpm" needs="x11" section="View, modify or create a picture"
-
+?package(koffice): needs="x11" kde_filename="kontour" section="View, modify or create a picture" title="Create vector based draws" icon="kontour.png" command="kontour" mimetypes="application/x-kontour" kde_opt="\\nX-KDE-Library=libkontourpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart\\nX-KDE-NativeMimeType=application/x-kontour\\nDocPath=kontour/index.html\\nKDE-X-StartupNotify=true"
+?package(sodipodi): needs="gnome" icon="sodipodi.xpm" section="View, modify or create a picture" title="Create vector based draws" command="/usr/bin/sodipodi"
 
-# xpcd
-?package(xpcd): command="/usr/bin/xpcd" needs="X11" icon="xpcd.xpm" section="View, modify or create a picture" title="View PhotoCD using XPcd"