From 648878eac26183e145903880ec6bbad035b6a1b6 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@mandriva.com>
Date: Thu, 23 Aug 2007 17:25:42 +0000
Subject: New menu

---
 menu/applications-discovery.menu                   |  262 ----
 menu/applications-mdk.menu                         | 1614 --------------------
 menu/applications.menu.in                          |  863 +++++++++++
 menu/defaultlayout-simplified.menu                 |   22 -
 menu/defaultlayout.menu                            |   13 -
 menu/desktop-common-data                           |  255 ----
 .../mandriva-accessibility.directory.in            |    5 +
 .../mandriva-development-databases.directory.in    |    5 +
 ...evelopment-developmentenvironments.directory.in |    5 +
 .../mandriva-development-tools.directory.in        |    5 +
 ...andriva-development-webdevelopment.directory.in |    5 +
 .../mandriva-development.directory.in              |    5 +
 .../mandriva-documentation.directory.in            |    5 +
 .../mandriva-education-economy.directory.in        |    5 +
 .../mandriva-education-geography.directory.in      |    5 +
 .../mandriva-education-history.directory.in        |    5 +
 .../mandriva-education-languages.directory.in      |    5 +
 .../mandriva-education-literature.directory.in     |    5 +
 .../mandriva-education-other.directory.in          |    5 +
 .../mandriva-education-sciences.directory.in       |    5 +
 .../mandriva-education-sports.directory.in         |    5 +
 .../mandriva-education.directory.in                |    5 +
 .../mandriva-emulators.directory.in                |    5 +
 .../mandriva-games-adventure.directory.in          |    5 +
 .../mandriva-games-arcade.directory.in             |    5 +
 .../mandriva-games-boards.directory.in             |    5 +
 .../mandriva-games-cards.directory.in              |    5 +
 .../mandriva-games-other.directory.in              |    5 +
 .../mandriva-games-puzzles.directory.in            |    5 +
 .../mandriva-games-sports.directory.in             |    5 +
 .../mandriva-games-strategy.directory.in           |    5 +
 .../mandriva-games-toys.directory.in               |    5 +
 .../mandriva-games.directory.in                    |    5 +
 .../mandriva-graphics.directory.in                 |    5 +
 .../mandriva-internet-chat.directory.in            |    5 -
 .../mandriva-internet-filetransfer.directory.in    |    5 -
 ...mandriva-internet-instantmessaging.directory.in |    5 -
 .../mandriva-internet-mail.directory.in            |    5 -
 .../mandriva-internet-more.directory.in            |    5 +
 .../mandriva-internet-news.directory.in            |    5 -
 .../mandriva-internet-other.directory.in           |    5 -
 .../mandriva-internet-remoteaccess.directory.in    |    5 -
 .../mandriva-internet-videoconference.directory.in |    5 -
 .../mandriva-internet-webbrowsers.directory.in     |    5 -
 .../mandriva-internet-webeditors.directory.in      |    5 -
 ...iva-moreapplications-accessibility.directory.in |    5 -
 ...andriva-moreapplications-databases.directory.in |    5 -
 ...evelopment-developmentenvironments.directory.in |    5 -
 ...lications-development-interpreters.directory.in |    5 -
 ...moreapplications-development-other.directory.in |    5 -
 ...moreapplications-development-tools.directory.in |    5 -
 ...driva-moreapplications-development.directory.in |    5 -
 ...iva-moreapplications-documentation.directory.in |    5 -
 ...moreapplications-education-economy.directory.in |    5 -
 ...reapplications-education-geography.directory.in |    5 -
 ...moreapplications-education-history.directory.in |    5 -
 ...reapplications-education-languages.directory.in |    5 -
 ...eapplications-education-literature.directory.in |    5 -
 ...a-moreapplications-education-other.directory.in |    5 -
 ...oreapplications-education-sciences.directory.in |    5 -
 ...-moreapplications-education-sports.directory.in |    5 -
 ...andriva-moreapplications-education.directory.in |    5 -
 ...andriva-moreapplications-emulators.directory.in |    5 -
 ...a-moreapplications-games-adventure.directory.in |    5 -
 ...riva-moreapplications-games-arcade.directory.in |    5 -
 ...riva-moreapplications-games-boards.directory.in |    5 -
 ...driva-moreapplications-games-cards.directory.in |    5 -
 ...driva-moreapplications-games-other.directory.in |    5 -
 ...iva-moreapplications-games-puzzles.directory.in |    5 -
 ...riva-moreapplications-games-sports.directory.in |    5 -
 ...va-moreapplications-games-strategy.directory.in |    5 -
 ...ndriva-moreapplications-games-toys.directory.in |    5 -
 .../mandriva-moreapplications-games.directory.in   |    5 -
 ...ns-sciences-artificialintelligence.directory.in |    5 -
 ...oreapplications-sciences-astronomy.directory.in |    5 -
 ...-moreapplications-sciences-biology.directory.in |    5 -
 ...oreapplications-sciences-chemistry.directory.in |    5 -
 ...lications-sciences-computerscience.directory.in |    5 -
 ...cations-sciences-datavisualization.directory.in |    5 -
 ...eapplications-sciences-electricity.directory.in |    5 -
 ...eapplications-sciences-geosciences.directory.in |    5 -
 ...lications-sciences-imageprocessing.directory.in |    5 -
 ...eapplications-sciences-mathematics.directory.in |    5 -
 ...lications-sciences-numericanalysis.directory.in |    5 -
 ...va-moreapplications-sciences-other.directory.in |    5 -
 ...cations-sciences-parallelcomputing.directory.in |    5 -
 ...-moreapplications-sciences-physics.directory.in |    5 -
 ...moreapplications-sciences-robotics.directory.in |    5 -
 ...mandriva-moreapplications-sciences.directory.in |    5 -
 .../mandriva-multimedia-graphics.directory.in      |    5 -
 .../mandriva-multimedia-other.directory.in         |    5 -
 .../mandriva-multimedia-sound.directory.in         |    5 -
 .../mandriva-multimedia-video.directory.in         |    5 -
 .../mandriva-multimedia.directory.in               |    5 -
 .../mandriva-office-accessories.directory.in       |    5 -
 .../mandriva-office-addressbooks.directory.in      |    5 -
 ...mandriva-office-communications-fax.directory.in |    5 -
 ...ndriva-office-communications-other.directory.in |    5 -
 ...mandriva-office-communications-pda.directory.in |    5 -
 ...ndriva-office-communications-phone.directory.in |    5 -
 .../mandriva-office-communications.directory.in    |    5 -
 .../mandriva-office-drawing.directory.in           |    5 -
 .../mandriva-office-graphs.directory.in            |    5 -
 .../mandriva-office-more.directory.in              |    5 +
 .../mandriva-office-other.directory.in             |    5 -
 .../mandriva-office-presentations.directory.in     |    5 -
 .../mandriva-office-publishing.directory.in        |    5 -
 .../mandriva-office-spreadsheets.directory.in      |    5 -
 .../mandriva-office-tasksmanagement.directory.in   |    5 -
 .../mandriva-office-timemanagement.directory.in    |    5 -
 .../mandriva-office-wordprocessors.directory.in    |    5 -
 ...va-sciences-artificialintelligence.directory.in |    5 +
 .../mandriva-sciences-astronomy.directory.in       |    5 +
 .../mandriva-sciences-biology.directory.in         |    5 +
 .../mandriva-sciences-chemistry.directory.in       |    5 +
 .../mandriva-sciences-computerscience.directory.in |    5 +
 ...andriva-sciences-datavisualization.directory.in |    5 +
 .../mandriva-sciences-electricity.directory.in     |    5 +
 .../mandriva-sciences-geosciences.directory.in     |    5 +
 .../mandriva-sciences-imageprocessing.directory.in |    5 +
 .../mandriva-sciences-mathematics.directory.in     |    5 +
 .../mandriva-sciences-numericanalysis.directory.in |    5 +
 .../mandriva-sciences-other.directory.in           |    5 +
 ...andriva-sciences-parallelcomputing.directory.in |    5 +
 .../mandriva-sciences-physics.directory.in         |    5 +
 .../mandriva-sciences-robotics.directory.in        |    5 +
 .../mandriva-sciences.directory.in                 |    5 +
 .../mandriva-soundvideo-other.directory.in         |    5 +
 .../mandriva-soundvideo.directory.in               |    5 +
 .../mandriva-system-archiving-backup.directory.in  |    5 -
 ...andriva-system-archiving-cdburning.directory.in |    5 -
 ...driva-system-archiving-compression.directory.in |    5 -
 .../mandriva-system-archiving-other.directory.in   |    5 -
 .../mandriva-system-archiving.directory.in         |    5 -
 ...a-system-configuration-bootandinit.directory.in |    5 -
 ...riva-system-configuration-hardware.directory.in |    5 -
 ...va-system-configuration-networking.directory.in |    5 -
 ...andriva-system-configuration-other.directory.in |    5 -
 ...iva-system-configuration-packaging.directory.in |    5 -
 ...riva-system-configuration-printing.directory.in |    5 -
 .../mandriva-system-configuration.directory.in     |    5 -
 .../mandriva-system-filetools.directory.in         |    5 -
 .../mandriva-system-monitoring.directory.in        |    5 -
 .../mandriva-system-terminals.directory.in         |    5 -
 .../mandriva-system-texttools.directory.in         |    5 -
 .../mandriva-system.directory.in                   |    5 -
 .../mandriva-systemtools.directory.in              |    5 +
 .../mandriva-tools-other.directory.in              |    5 +
 .../mandriva-tools.directory.in                    |    5 +
 menu/mandrake_desk-9.2                             |  200 ---
 menu/mandriva-discovery.menu                       |  194 ---
 menu/menu                                          |  128 --
 menu/menu-simplified                               |   31 -
 menu/translate_menus                               |  109 --
 menu/translate_menus-simplified                    |   98 --
 155 files changed, 1118 insertions(+), 3386 deletions(-)
 delete mode 100644 menu/applications-discovery.menu
 delete mode 100644 menu/applications-mdk.menu
 create mode 100644 menu/applications.menu.in
 delete mode 100644 menu/defaultlayout-simplified.menu
 delete mode 100644 menu/defaultlayout.menu
 delete mode 100644 menu/desktop-common-data
 create mode 100644 menu/desktop-directories/mandriva-accessibility.directory.in
 create mode 100644 menu/desktop-directories/mandriva-development-databases.directory.in
 create mode 100644 menu/desktop-directories/mandriva-development-developmentenvironments.directory.in
 create mode 100644 menu/desktop-directories/mandriva-development-tools.directory.in
 create mode 100644 menu/desktop-directories/mandriva-development-webdevelopment.directory.in
 create mode 100644 menu/desktop-directories/mandriva-development.directory.in
 create mode 100644 menu/desktop-directories/mandriva-documentation.directory.in
 create mode 100644 menu/desktop-directories/mandriva-education-economy.directory.in
 create mode 100644 menu/desktop-directories/mandriva-education-geography.directory.in
 create mode 100644 menu/desktop-directories/mandriva-education-history.directory.in
 create mode 100644 menu/desktop-directories/mandriva-education-languages.directory.in
 create mode 100644 menu/desktop-directories/mandriva-education-literature.directory.in
 create mode 100644 menu/desktop-directories/mandriva-education-other.directory.in
 create mode 100644 menu/desktop-directories/mandriva-education-sciences.directory.in
 create mode 100644 menu/desktop-directories/mandriva-education-sports.directory.in
 create mode 100644 menu/desktop-directories/mandriva-education.directory.in
 create mode 100644 menu/desktop-directories/mandriva-emulators.directory.in
 create mode 100644 menu/desktop-directories/mandriva-games-adventure.directory.in
 create mode 100644 menu/desktop-directories/mandriva-games-arcade.directory.in
 create mode 100644 menu/desktop-directories/mandriva-games-boards.directory.in
 create mode 100644 menu/desktop-directories/mandriva-games-cards.directory.in
 create mode 100644 menu/desktop-directories/mandriva-games-other.directory.in
 create mode 100644 menu/desktop-directories/mandriva-games-puzzles.directory.in
 create mode 100644 menu/desktop-directories/mandriva-games-sports.directory.in
 create mode 100644 menu/desktop-directories/mandriva-games-strategy.directory.in
 create mode 100644 menu/desktop-directories/mandriva-games-toys.directory.in
 create mode 100644 menu/desktop-directories/mandriva-games.directory.in
 create mode 100644 menu/desktop-directories/mandriva-graphics.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-internet-chat.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-internet-filetransfer.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-internet-instantmessaging.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-internet-mail.directory.in
 create mode 100644 menu/desktop-directories/mandriva-internet-more.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-internet-news.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-internet-other.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-internet-remoteaccess.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-internet-videoconference.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-internet-webbrowsers.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-internet-webeditors.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-databases.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-development-other.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-development.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-documentation.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-education-history.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-education-other.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-education.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-emulators.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-games-other.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-games.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-moreapplications-sciences.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-multimedia-graphics.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-multimedia-other.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-multimedia-sound.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-multimedia-video.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-multimedia.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-accessories.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-addressbooks.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-communications-fax.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-communications-other.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-communications-pda.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-communications-phone.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-communications.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-drawing.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-graphs.directory.in
 create mode 100644 menu/desktop-directories/mandriva-office-more.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-other.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-presentations.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-publishing.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-spreadsheets.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-tasksmanagement.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-timemanagement.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-office-wordprocessors.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-artificialintelligence.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-astronomy.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-biology.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-chemistry.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-computerscience.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-datavisualization.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-electricity.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-geosciences.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-imageprocessing.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-mathematics.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-numericanalysis.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-other.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-parallelcomputing.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-physics.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences-robotics.directory.in
 create mode 100644 menu/desktop-directories/mandriva-sciences.directory.in
 create mode 100644 menu/desktop-directories/mandriva-soundvideo-other.directory.in
 create mode 100644 menu/desktop-directories/mandriva-soundvideo.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-archiving-backup.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-archiving-compression.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-archiving-other.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-archiving.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-configuration-hardware.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-configuration-networking.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-configuration-other.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-configuration-packaging.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-configuration-printing.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-configuration.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-filetools.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-monitoring.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-terminals.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system-texttools.directory.in
 delete mode 100644 menu/desktop-directories/mandriva-system.directory.in
 create mode 100644 menu/desktop-directories/mandriva-systemtools.directory.in
 create mode 100644 menu/desktop-directories/mandriva-tools-other.directory.in
 create mode 100644 menu/desktop-directories/mandriva-tools.directory.in
 delete mode 100644 menu/mandrake_desk-9.2
 delete mode 100644 menu/mandriva-discovery.menu
 delete mode 100644 menu/menu
 delete mode 100644 menu/menu-simplified
 delete mode 100644 menu/translate_menus
 delete mode 100644 menu/translate_menus-simplified

(limited to 'menu')

diff --git a/menu/applications-discovery.menu b/menu/applications-discovery.menu
deleted file mode 100644
index 5874247..0000000
--- a/menu/applications-discovery.menu
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
-<Menu>
-  <Name>Applications</Name>
-  <Layout>
-    <Menuname>Games</Menuname>
-    <Menuname>Graphics</Menuname>
-    <Menuname>Internet</Menuname>
-    <Menuname>Multimedia</Menuname>
-    <Menuname>Office</Menuname>
-    <Menuname>System</Menuname>
-    <Menuname>Help</Menuname>
-    <Menuname>More Applications</Menuname>
-    <Merge type="menus"/>
-    <Merge type="files"/>
-  </Layout>
-  <DefaultLayout inline="true" inline_limit="1" inline_header="false">
-    <Merge type="menus"/>
-    <Merge type="files"/>
-  </DefaultLayout>
-  <DefaultMergeDirs/>
-  <KDELegacyDirs/>
-  <DefaultAppDirs/>
-  <DefaultDirectoryDirs/>
-  <Directory>mandrivalinux.directory</Directory>
-  <Include>
-    <Or>
-      <Category>X-MandrivaLinux</Category>
-      <Category>X-MandrivaLinux-Other</Category>
-    </Or>
-  </Include>
-  <Menu>
-    <Name>Games</Name>
-    <Directory>mandriva-moreapplications-games.directory</Directory>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-MoreApplications-Games</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Games-Adventure</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Games-Arcade</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Games-Boards</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Games-Cards</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Games-Puzzles</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Games-Sports</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Games-Strategy</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Games-Other</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Games-Toys</Category>
-        <Category>Game</Category>
-        <Category>Amusement</Category>
-      </Or>
-    </Include>
-  </Menu>
-  <Menu>
-    <Name>Graphics</Name>
-    <Directory>mandriva-multimedia-graphics.directory</Directory>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-Multimedia-Graphics</Category>
-        <Category>Graphics</Category>
-      </Or>
-    </Include>
-  </Menu>
-  <Menu>
-    <Name>Internet</Name>
-    <Directory>mandriva-internet.directory</Directory>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-Internet</Category>
-        <Category>X-MandrivaLinux-Internet-Chat</Category>
-        <Category>X-MandrivaLinux-Internet-FileTransfer</Category>
-        <Category>X-MandrivaLinux-Internet-InstantMessaging</Category>
-        <Category>X-MandrivaLinux-Internet-Mail</Category>
-        <Category>X-MandrivaLinux-Internet-News</Category>
-        <Category>X-MandrivaLinux-Internet-VideoConference</Category>
-        <Category>X-MandrivaLinux-Internet-Other</Category>
-        <Category>X-MandrivaLinux-Internet-RemoteAccess</Category>
-        <Category>X-MandrivaLinux-Internet-WebBrowsers</Category>
-        <Category>X-MandrivaLinux-Internet-WebEditors</Category>
-	<And>
-		<Category>Network</Category>
-		<Not>
-			<Category>Settings</Category>
-		</Not>
-	</And>
-      </Or>
-    </Include>
-  </Menu>
-  <Menu>
-    <Name>Multimedia</Name>
-    <Layout>
-      <Menuname>Sound</Menuname>
-      <Menuname>Video</Menuname>
-      <Menuname>Other</Menuname>
-      <Merge type="menus"/>
-      <Merge type="files"/>
-    </Layout>
-    <Directory>mandriva-multimedia.directory</Directory>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-Multimedia</Category>
-        <Category>X-MandrivaLinux-Multimedia-Sound</Category>
-        <Category>X-MandrivaLinux-Multimedia-Video</Category>
-        <Category>X-MandrivaLinux-Multimedia-Other</Category>
-        <Category>Audio</Category>
-        <Category>Video</Category>
-        <Category>AudioVideo</Category>
-      </Or>
-    </Include>
-  </Menu>
-  <Menu>
-    <Name>Office</Name>
-    <Directory>mandriva-office.directory</Directory>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-MoreApplications-Editors</Category>
-        <Category>X-MandrivaLinux-Office</Category>
-        <Category>X-MandrivaLinux-Office-Accessories</Category>
-        <Category>X-MandrivaLinux-Office-AddressBooks</Category>
-        <Category>X-MandrivaLinux-Office-Communications</Category>
-        <Category>X-MandrivaLinux-Office-Communications-Fax</Category>
-        <Category>X-MandrivaLinux-Office-Communications-PDA</Category>
-        <Category>X-MandrivaLinux-Office-Communications-Phone</Category>
-        <Category>X-MandrivaLinux-Office-Communications-Other</Category>
-        <Category>X-MandrivaLinux-Office-Drawing</Category>
-        <Category>X-MandrivaLinux-Office-Graphs</Category>
-        <Category>X-MandrivaLinux-Office-Presentations</Category>
-        <Category>X-MandrivaLinux-Office-Publishing</Category>
-        <Category>X-MandrivaLinux-Office-Spreadsheets</Category>
-        <Category>X-MandrivaLinux-Office-TasksManagement</Category>
-        <Category>X-MandrivaLinux-Office-TimeManagement</Category>
-        <Category>X-MandrivaLinux-Office-Other</Category>
-        <Category>X-MandrivaLinux-Office-Wordprocessors</Category>
-        <Category>Office</Category>
-      </Or>
-    </Include>
-  </Menu>
-  <Menu>
-    <Name>System</Name>
-    <Directory>mandriva-system.directory</Directory>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-System</Category>
-        <Category>X-MandrivaLinux-System-Archiving</Category>
-        <Category>X-MandrivaLinux-System-Archiving-Backup</Category>
-        <Category>X-MandrivaLinux-System-Archiving-CDBurning</Category>
-        <Category>X-MandrivaLinux-System-Archiving-Compression</Category>
-        <Category>X-MandrivaLinux-System-Archiving-Other</Category>
-        <Category>X-MandrivaLinux-System-FileTools</Category>
-        <Category>X-MandrivaLinux-System-Monitoring</Category>
-        <Category>X-MandrivaLinux-System-Session</Category>
-        <Category>X-MandrivaLinux-System-Session-Windowmanagers</Category>
-        <Category>X-MandrivaLinux-System-Terminals</Category>
-        <Category>X-MandrivaLinux-System-TextTools</Category>
-        <Category>X-MandrivaLinux-System-Configuration</Category>
-        <Category>X-MandrivaLinux-System-Configuration-BootandInit</Category>
-        <Category>X-MandrivaLinux-System-Configuration-Hardware</Category>
-        <Category>X-MandrivaLinux-System-Configuration-Networking</Category>
-        <Category>X-MandrivaLinux-System-Configuration-Packaging</Category>
-        <Category>X-MandrivaLinux-System-Configuration-Printing</Category>
-        <Category>X-MandrivaLinux-System-Configuration-Users</Category>
-        <Category>X-MandrivaLinux-System-Configuration-Other</Category>
-	<And>
-		<Category>Settings</Category>
-		<Not>
-			<Category>GNOME</Category>
-		</Not>
-	</And>
-	<And>
-		<Category>Utility</Category>
-		<Not>
-			<Category>Accessibility</Category>
-		</Not>
-	</And>
-        <Category>System</Category>
-      </Or>
-    </Include>
-<!-- Empty node for KDE -->
-    <Menu>
-      <Name>ScreenSaver</Name>
-    </Menu>
-  </Menu>
-  <Menu>
-    <Name>Documentation</Name>
-    <Directory>mandriva-moreapplications-documentation.directory</Directory>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-MoreApplications-Documentation</Category>
-        <Category>Documentation</Category>
-      </Or>
-    </Include>
-  </Menu>
-  <Menu>
-    <Name>More Applications</Name>
-    <Directory>mandriva-moreapplications.directory</Directory>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-MoreApplications</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Accessibility</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Communications</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Finances</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Databases</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Emulators</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Development</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Development-Interpreters</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Development-Tools</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Development-Other</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Other</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Education</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Education-Economy</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Education-Geography</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Education-History</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Education-Languages</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Education-Literature</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Education-Sciences</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Education-Sports</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Education-Other</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-ArtificialIntelligence</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-Astronomy</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-Biology</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-Chemistry</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-ComputerScience</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-DataVisualization</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-Electricity</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-Geosciences</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-ImageProcessing</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-Mathematics</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-NumericAnalysis</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-ParallelComptuting</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-Physics</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-Robotics</Category>
-        <Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category>
-        <Category>Development</Category>
-        <Category>Education</Category>
-        <Category>Electronics</Category>
-        <Category>Engineering</Category>
-	<And>
-		<Category>Utility</Category>
-		<Category>Accessibility</Category>
-	</And>
-      </Or>
-    </Include>
-  </Menu>
-<!-- Empty nodes used by KDE -->
-  <Menu>
-    <Name>Settings</Name>
-  </Menu>
-  <Menu>
-    <Name>Information</Name>
-  </Menu>
-  <Menu>
-    <Name>.hidden</Name>
-    <Directory>mandriva-hidden.directory</Directory>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-.hidden</Category>
-      </Or>
-    </Include>
-  </Menu>
-  <MergeFile>/etc/xdg/discovery/menus/mandriva-discovery.menu</MergeFile>
-  <MergeFile>applications-kmenuedit.menu</MergeFile>
-</Menu>
diff --git a/menu/applications-mdk.menu b/menu/applications-mdk.menu
deleted file mode 100644
index a2ec6e4..0000000
--- a/menu/applications-mdk.menu
+++ /dev/null
@@ -1,1614 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
-<Menu>
-  <Name>Applications</Name>
-  <Layout>
-    <Menuname>Office</Menuname>
-    <Menuname>Internet</Menuname>
-    <Menuname>Multimedia</Menuname>
-    <Menuname>System</Menuname>
-    <Menuname>More Applications</Menuname>
-    <Menuname>Other</Menuname>
-    <Merge type="menus"/>
-    <Merge type="files"/>
-  </Layout>
-  <DefaultLayout inline="true" inline_limit="1" inline_header="false">
-    <Merge type="menus"/>
-    <Merge type="files"/>
-  </DefaultLayout>
-  <DefaultMergeDirs/>
-  <KDELegacyDirs/>
-  <DefaultAppDirs/>
-  <DefaultDirectoryDirs/>
-  <Directory>mandrivalinux.directory</Directory>
-  <Include>
-    <Or>
-      <Category>X-MandrivaLinux</Category>
-    </Or>
-  </Include>
-  <Menu>
-    <Name>Office</Name>
-    <Layout>
-      <Menuname>Wordprocessors</Menuname>
-      <Menuname>Spreadsheets</Menuname>
-      <Menuname>Presentations</Menuname>
-      <Menuname>Drawing</Menuname>
-      <Menuname>Graphs</Menuname>
-      <Menuname>Publishing</Menuname>
-      <Menuname>Tasks Management</Menuname>
-      <Menuname>Time Management</Menuname>
-      <Menuname>Address Books</Menuname>
-      <Menuname>Communications</Menuname>
-      <Menuname>Accessories</Menuname>
-      <Menuname>Other</Menuname>
-      <Merge type="menus"/>
-      <Merge type="files"/>
-    </Layout>
-    <Directory>mandriva-office.directory</Directory>
-    <OnlyUnallocated/>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-Office</Category>
-        <Category>Office</Category>
-      </Or>
-    </Include>
-    <Menu>
-      <Name>Accessories</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-kcalc.desktop</Filename>
-        <Filename>MandrivaLinux-Office-Accessories-oooqs.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-office-accessories.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Office-Accessories</Category>
-          <Category>Calculator</Category>
-          <Category>Dictionary</Category>
-          <Category>Clock</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Address Books</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-kaddressbook.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-office-addressbooks.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Office-AddressBooks</Category>
-          <Category>ContactManagement</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Communications</Name>
-      <Layout>
-        <Menuname>Fax</Menuname>
-        <Menuname>Phone</Menuname>
-        <Menuname>PDA</Menuname>
-        <Menuname>Other</Menuname>
-        <Merge type="menus"/>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-office-communications.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Office-Communications</Category>
-        </Or>
-      </Include>
-      <Menu>
-        <Name>Fax</Name>
-        <Directory>mandriva-office-communications-fax.directory</Directory>
-        <Include>
-          <Category>X-MandrivaLinux-Office-Communications-Fax</Category>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>PDA</Name>
-        <Layout>
-          <Merge type="menus"/>
-          <Filename>kde-kpilot.desktop</Filename>
-          <Merge type="files"/>
-        </Layout>
-        <Directory>mandriva-office-communications-pda.directory</Directory>
-        <Include>
-          <Or>
-            <Category>PDA</Category>
-            <Category>X-MandrivaLinux-Office-Communications-PDA</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Phone</Name>
-        <Directory>mandriva-office-communications-phone.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-Office-Communications-Phone</Category>
-            <Category>TelephonyTool</Category>
-            <Category>TelephonyTools</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Other</Name>
-        <Directory>mandriva-office-communications-other.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-Office-Communications-Other</Category>
-          </Or>
-        </Include>
-      </Menu>
-    </Menu>
-    <Menu>
-      <Name>Drawing</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>MandrivaLinux-Office-Drawing-OpenOffice.org Draw.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-office-drawing.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Office-Drawing</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Graphs</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>MandrivaLinux-Office-Graphs-Dia.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-office-graphs.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Office-Graphs</Category>
-          <Category>Chart</Category>
-          <Category>FlowChart</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Presentations</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>MandrivaLinux-Office-Presentations-OpenOffice.org Impress.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-office-presentations.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Office-Presentations</Category>
-          <Category>Presentation</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Publishing</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>MandrivaLinux-Office-Publishing-Xpdf.desktop</Filename>
-        <Filename>MandrivaLinux-Office-Publishing-GhostView.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-office-publishing.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Office-Publishing</Category>
-          <Category>Scanning</Category>
-          <Category>OCR</Category>
-          <And>
-            <Category>Office</Category>
-            <Category>Viewer</Category>
-          </And>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Spreadsheets</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>MandrivaLinux-Office-Spreadsheets-OpenOffice.org Calc.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-office-spreadsheets.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Office-Spreadsheets</Category>
-          <Category>Spreadsheet</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Tasks Management</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>MandrivaLinux-Office-TasksManagement-Planner.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-office-tasksmanagement.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Office-TasksManagement</Category>
-          <Category>ProjectManagement</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Time Management</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-korganizer.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-office-timemanagement.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Office-TimeManagement</Category>
-          <Category>Calendar</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Other</Name>
-      <Directory>mandriva-office-other.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Office-Other</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Wordprocessors</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>MandrivaLinux-Office-Wordprocessors-OpenOffice.org Writer.desktop</Filename>
-        <Filename>MandrivaLinux-Office-Wordprocessors-OpenOffice.org Math.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-office-wordprocessors.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Office-Wordprocessors</Category>
-          <Category>WordProcessor</Category>
-        </Or>
-      </Include>
-    </Menu>
-  </Menu>
-  <Menu>
-    <Name>Internet</Name>
-    <Layout>
-      <Menuname>Web Browsers</Menuname>
-      <Menuname>Mail</Menuname>
-      <Menuname>Instant Messaging</Menuname>
-      <Menuname>Chat</Menuname>
-      <Menuname>News</Menuname>
-      <Menuname>File Transfer</Menuname>
-      <Menuname>Video Conference</Menuname>
-      <Menuname>Web Editors</Menuname>
-      <Menuname>Remote Access</Menuname>
-      <Menuname>Other</Menuname>
-      <Merge type="menus"/>
-      <Merge type="files"/>
-    </Layout>
-    <Directory>mandriva-internet.directory</Directory>
-    <OnlyUnallocated/>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-Internet</Category>
-        <Category>Network</Category>
-      </Or>
-    </Include>
-    <Menu>
-      <Name>Chat</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-ksirc.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-internet-chat.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Internet-Chat</Category>
-          <Category>IRCClient</Category>
-          <Category>Chat</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>File Transfer</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>MandrivaLinux-Internet-FileTransfer-kbear.desktop</Filename>
-        <Filename>MandrivaLinux-Internet-FileTransfer-Gtm.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-internet-filetransfer.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Internet-FileTransfer</Category>
-          <Category>FileTransfer</Category>
-          <Category>P2P</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Instant Messaging</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-kopete.desktop</Filename>
-        <Filename>MandrivaLinux-Internet-InstantMessaging-Gaim.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-internet-instantmessaging.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Internet-InstantMessaging</Category>
-          <Category>InstantMessaging</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Mail</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-Kontact.desktop</Filename>
-        <Filename>evolution.desktop</Filename>
-        <Filename>MandrivaLinux-Internet-Mail-Mozilla Thunderbird.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-internet-mail.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Internet-Mail</Category>
-          <Category>Email</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>News</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-KNode.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-internet-news.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Internet-News</Category>
-          <Category>News</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Video Conference</Name>
-      <Directory>mandriva-internet-videoconference.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Internet-VideoConference</Category>
-          <Category>Telephony</Category>
-          <Category>VideoConference</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Other</Name>
-      <Directory>mandriva-internet-other.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Internet-Other</Category>
-          <And>
-            <Category>Network</Category>
-            <Category>HamRadio</Category>
-          </And>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Remote Access</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-Kppp.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-internet-remoteaccess.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Internet-RemoteAccess</Category>
-          <Category>RemoteAccess</Category>
-          <Category>Dialup</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Web Browsers</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-konqbrowser.desktop</Filename>
-        <Filename>MandrivaLinux-Internet-WebBrowsers-Mozilla Firefox.desktop</Filename>
-        <Filename>MandrivaLinux-Internet-WebBrowsers-Mozilla.desktop</Filename>
-        <Filename>MandrivaLinux-Internet-WebBrowsers-Epiphany Web Browser.desktop</Filename>
-        <Filename>MandrivaLinux-Internet-WebBrowsers-Epiphany Bookmarks Editor.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-internet-webbrowsers.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Internet-WebBrowsers</Category>
-          <Category>WebBrowser</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Web Editors</Name>
-      <Directory>mandriva-internet-webeditors.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Internet-WebEditors</Category>
-          <Category>WebDevelopment</Category>
-        </Or>
-      </Include>
-    </Menu>
-  </Menu>
-  <Menu>
-    <Name>More Applications</Name>
-    <Layout>
-      <Menuname>Accessibility</Menuname>
-      <Menuname>Development</Menuname>
-      <Menuname>Editors</Menuname>
-      <Menuname>Emulators</Menuname>
-      <Menuname>Finances</Menuname>
-      <Menuname>Databases</Menuname>
-      <Menuname>Education</Menuname>
-      <Menuname>Sciences</Menuname>
-      <Menuname>Games</Menuname>
-      <Menuname>Documentation</Menuname>
-      <Menuname>Other</Menuname>
-      <Merge type="menus"/>
-      <Merge type="files"/>
-    </Layout>
-    <Directory>mandriva-moreapplications.directory</Directory>
-    <OnlyUnallocated/>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-MoreApplications</Category>
-        <Category>Utility</Category>
-      </Or>
-    </Include>
-    <Menu>
-      <Name>Accessibility</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-kmag.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-moreapplications-accessibility.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-MoreApplications-Accessibility</Category>
-          <Category>Accessibility</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Communications</Name>
-      <Directory>mandriva-moreapplications-communications.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-MoreApplications-Communications</Category>
-          <Category>Communications</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Finances</Name>
-      <Directory>mandriva-moreapplications-finances.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-MoreApplications-Finances</Category>
-          <Category>Finance</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Databases</Name>
-      <Directory>mandriva-moreapplications-databases.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-MoreApplications-Databases</Category>
-          <Category>Database</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Emulators</Name>
-      <Directory>mandriva-moreapplications-emulators.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-MoreApplications-Emulators</Category>
-          <And>
-            <Category>System</Category>
-            <Category>Emulator</Category>
-          </And>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Development</Name>
-      <Layout>
-        <Menuname>Development Environment</Menuname>
-        <Menuname>Interpreters</Menuname>
-        <Menuname>Tools</Menuname>
-        <Menuname>Code Generators</Menuname>
-        <Menuname>Other</Menuname>
-        <Merge type="menus"/>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-moreapplications-development.directory</Directory>
-      <OnlyUnallocated/>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-MoreApplications-Development</Category>
-          <Category>Development</Category>
-        </Or>
-      </Include>
-      <Menu>
-        <Name>Development Environments</Name>
-        <Layout>
-          <Merge type="menus"/>
-          <Filename>kde-kdevelop.desktop</Filename>
-          <Merge type="files"/>
-        </Layout>
-        <Directory>mandriva-moreapplications-development-developmentenvironments.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments</Category>
-            <Category>IDE</Category>
-            <Category>GUIDesigner</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Interpreters</Name>
-        <Layout>
-          <Merge type="menus"/>
-          <Filename>MandrivaLinux-MoreApplications-Development-Interpreters-GNU Prolog.desktop</Filename>
-          <Merge type="files"/>
-        </Layout>
-        <Directory>mandriva-moreapplications-development-interpreters.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Development-Interpreters</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Tools</Name>
-        <Layout>
-          <Merge type="menus"/>
-          <Filename>MandrivaLinux-MoreApplications-Development-Tools-Gdb.desktop</Filename>
-          <Merge type="files"/>
-        </Layout>
-        <Directory>mandriva-moreapplications-development-tools.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Development-Tools</Category>
-            <Category>Building</Category>
-            <Category>Profiling</Category>
-            <Category>Debugger</Category>
-            <Category>RevisionControl</Category>
-            <And>
-              <Category>Development</Category>
-              <Category>Translation</Category>
-            </And>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Other</Name>
-        <Directory>mandriva-moreapplications-development-other.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Development-Other</Category>
-          </Or>
-        </Include>
-      </Menu>
-    </Menu>
-    <Menu>
-      <Name>Documentation</Name>
-      <Directory>mandriva-moreapplications-documentation.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-MoreApplications-Documentation</Category>
-          <Category>Documentation</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Other</Name>
-      <Directory>mandriva-moreapplications-other.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-MoreApplications-Other</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Editors</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>MandrivaLinux-MoreApplications-Editors-Emacs.desktop</Filename>
-        <Filename>MandrivaLinux-MoreApplications-Editors-XEmacs.desktop</Filename>
-        <Filename>MandrivaLinux-MoreApplications-Editors-VI editor.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-moreapplications-editors.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-MoreApplications-Editors</Category>
-          <Category>TextEditor</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Education</Name>
-      <Layout>
-        <Menuname>Economy</Menuname>
-        <Menuname>Geography</Menuname>
-        <Menuname>History</Menuname>
-        <Menuname>Languages</Menuname>
-        <Menuname>Literature</Menuname>
-        <Menuname>Sciences</Menuname>
-        <Menuname>Sports</Menuname>
-        <Menuname>Other</Menuname>
-        <Merge type="menus"/>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-moreapplications-education.directory</Directory>
-      <OnlyUnallocated/>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-MoreApplications-Education</Category>
-          <Category>Education</Category>
-        </Or>
-      </Include>
-      <Menu>
-        <Name>Economy</Name>
-        <Directory>mandriva-moreapplications-education-economy.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Education-Economy</Category>
-            <Category>Economy</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Geography</Name>
-        <Directory>mandriva-moreapplications-education-geography.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Education-Geography</Category>
-            <Category>Geography</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>History</Name>
-        <Directory>mandriva-moreapplications-education-history.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Education-History</Category>
-            <Category>History</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Languages</Name>
-        <Directory>mandriva-moreapplications-education-languages.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Education-Languages</Category>
-            <Category>Languages</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Literature</Name>
-        <Directory>mandriva-moreapplications-education-literature.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Education-Literature</Category>
-            <Category>Literature</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Sciences</Name>
-        <Directory>mandriva-moreapplications-education-sciences.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Education-Sciences</Category>
-            <And>
-              <Category>Science</Category>
-              <Category>Education</Category>
-            </And>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Sports</Name>
-        <Directory>mandriva-moreapplications-education-sports.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Education-Sports</Category>
-            <Category>Sports</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Other</Name>
-        <Directory>mandriva-moreapplications-education-other.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Education-Other</Category>
-            <Category>Art</Category>
-            <Category>Construction</Category>
-            <Category>Teaching</Category>
-            <And>
-              <Category>Education</Category>
-              <Category>Music</Category>
-            </And>
-          </Or>
-        </Include>
-      </Menu>
-    </Menu>
-    <Menu>
-      <Name>Games</Name>
-      <Layout>
-        <Menuname>Adventure</Menuname>
-        <Menuname>Arcade</Menuname>
-        <Menuname>Boards</Menuname>
-        <Menuname>Cards</Menuname>
-        <Menuname>Puzzles</Menuname>
-        <Menuname>Sports</Menuname>
-        <Menuname>Strategy</Menuname>
-        <Menuname>Toys</Menuname>
-        <Merge type="menus"/>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-moreapplications-games.directory</Directory>
-      <OnlyUnallocated/>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-MoreApplications-Games</Category>
-          <Category>Game</Category>
-        </Or>
-      </Include>
-      <Menu>
-        <Name>Adventure</Name>
-        <Directory>mandriva-moreapplications-games-adventure.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Games-Adventure</Category>
-            <Category>AdventureGame</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Arcade</Name>
-        <Directory>mandriva-moreapplications-games-arcade.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Games-Arcade</Category>
-            <Category>ArcadeGame</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Boards</Name>
-        <Directory>mandriva-moreapplications-games-boards.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Games-Boards</Category>
-            <Category>BoardGame</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Cards</Name>
-        <Directory>mandriva-moreapplications-games-cards.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Games-Cards</Category>
-            <Category>CardGame</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Puzzles</Name>
-        <Directory>mandriva-moreapplications-games-puzzles.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Games-Puzzles</Category>
-            <Category>LogicGame</Category>
-            <Category>BlocksGame</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Sports</Name>
-        <Directory>mandriva-moreapplications-games-sports.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Games-Sports</Category>
-            <Category>SportsGame</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Strategy</Name>
-        <Directory>mandriva-moreapplications-games-strategy.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Games-Strategy</Category>
-            <Category>StrategyGame</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Other</Name>
-        <Directory>mandriva-moreapplications-games-other.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Games-Other</Category>
-            <Category>KidsGame</Category>
-            <Category>RolePlaying</Category>
-            <Category>Simulation</Category>
-            <Category>ActionGame</Category>
-            <And>
-              <Category>Game</Category>
-              <Category>Emulator</Category>
-            </And>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Toys</Name>
-        <Directory>mandriva-moreapplications-games-toys.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Games-Toys</Category>
-            <Category>Amusement</Category>
-          </Or>
-        </Include>
-      </Menu>
-    </Menu>
-    <Menu>
-      <Name>Sciences</Name>
-      <Layout>
-        <Menuname>Artificial Intelligence</Menuname>
-        <Menuname>Astronomy</Menuname>
-        <Menuname>Biology</Menuname>
-        <Menuname>Chemistry</Menuname>
-        <Menuname>Computer Science</Menuname>
-        <Menuname>Data Visualization</Menuname>
-        <Menuname>Electricity</Menuname>
-        <Menuname>Geosciences</Menuname>
-        <Menuname>Image Processing</Menuname>
-        <Menuname>Mathematics</Menuname>
-        <Menuname>Numeric Analysis</Menuname>
-        <Menuname>Parallel Computing</Menuname>
-        <Menuname>Physics</Menuname>
-        <Menuname>Robotics</Menuname>
-        <Menuname>Other</Menuname>
-        <Merge type="menus"/>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-moreapplications-sciences.directory</Directory>
-      <OnlyUnallocated/>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-MoreApplications-Sciences</Category>
-          <Category>Science</Category>
-        </Or>
-      </Include>
-      <Menu>
-        <Name>Artificial Intelligence</Name>
-        <Directory>mandriva-moreapplications-sciences-artificialintelligence.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-ArtificialIntelligence</Category>
-            <Category>ArtificialIntelligence</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Astronomy</Name>
-        <Directory>mandriva-moreapplications-sciences-astronomy.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-Astronomy</Category>
-            <Category>Astronomy</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Biology</Name>
-        <Directory>mandriva-moreapplications-sciences-biology.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-Biology</Category>
-            <Category>Biology</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Chemistry</Name>
-        <Directory>mandriva-moreapplications-sciences-chemistry.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-Chemistry</Category>
-            <Category>Chemistry</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Computer Science</Name>
-        <Directory>mandriva-moreapplications-sciences-computerscience.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-ComputerScience</Category>
-            <Category>ComputerScience</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Data Visualization</Name>
-        <Directory>mandriva-moreapplications-sciences-datavisualization.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-DataVisualization</Category>
-            <Category>DataVisualization</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Electricity</Name>
-        <Directory>mandriva-moreapplications-sciences-electricity.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-Electricity</Category>
-            <Category>Electricity</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Geosciences</Name>
-        <Directory>mandriva-moreapplications-sciences-geosciences.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-Geosciences</Category>
-            <Category>Geoscience</Category>
-            <Category>Geology</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Image Processing</Name>
-        <Directory>mandriva-moreapplications-sciences-imageprocessing.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-ImageProcessing</Category>
-            <Category>ImageProcessing</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Mathematics</Name>
-        <Directory>mandriva-moreapplications-sciences-mathematics.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-Mathematics</Category>
-            <Category>Math</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Numeric Analysis</Name>
-        <Directory>mandriva-moreapplications-sciences-numericanalysis.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-NumericAnalysis</Category>
-            <Category>NumericAnalysis</Category>
-            <Category>NumericalAnalysis</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Parallel Computing</Name>
-        <Directory>mandriva-moreapplications-sciences-parallelcomputing.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-ParallelComptuting</Category>
-            <Category>ParallelComptuting</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Physics</Name>
-        <Directory>mandriva-moreapplications-sciences-physics.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-Physics</Category>
-            <Category>Physics</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Robotics</Name>
-        <Directory>mandriva-moreapplications-sciences-robotics.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-Robotics</Category>
-            <Category>Robotics</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Other</Name>
-        <Directory>mandriva-moreapplications-sciences-other.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category>
-            <Category>MedicalSoftware</Category>
-            <Category>Electronics</Category>
-            <Category>Engineering</Category>
-          </Or>
-        </Include>
-      </Menu>
-    </Menu>
-  </Menu>
-  <Menu>
-    <Name>Multimedia</Name>
-    <Layout>
-      <Menuname>Sound</Menuname>
-      <Menuname>Video</Menuname>
-      <Menuname>Graphics</Menuname>
-      <Menuname>Other</Menuname>
-      <Merge type="menus"/>
-      <Merge type="files"/>
-    </Layout>
-    <Directory>mandriva-multimedia.directory</Directory>
-    <OnlyUnallocated/>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-Multimedia</Category>
-        <Category>AudioVideo</Category>
-      </Or>
-    </Include>
-    <Menu>
-      <Name>Graphics</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>MandrivaLinux-Multimedia-Graphics-The GIMP.desktop</Filename>
-        <Filename>kde-kooka.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-multimedia-graphics.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Multimedia-Graphics</Category>
-          <Category>Graphics</Category>
-          <Category>Photography</Category>
-          <Category>3DGraphics</Category>
-          <Category>2DGraphics</Category>
-          <Category>VectorGraphics</Category>
-          <Category>RasterGraphics</Category>
-          <And>
-            <Category>Graphics</Category>
-            <Category>Viewer</Category>
-          </And>
-        </Or>
-      </Include>
-      <Exclude>
-        <Filename>kde-kpdf.desktop</Filename>
-        <Filename>kde-kghostview.desktop</Filename>
-      </Exclude>
-    </Menu>
-    <Menu>
-      <Name>Sound</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-kscd.desktop</Filename>
-        <Filename>MandrivaLinux-Multimedia-Sound-Totem Media Player.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-multimedia-sound.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Multimedia-Sound</Category>
-          <Category>Audio</Category>
-          <Category>Midi</Category>
-          <Category>Mixer</Category>
-          <Category>Sequencer</Category>
-          <Category>Tuner</Category>
-          <And>
-            <Category>Audio</Category>
-            <Or>
-              <Category>AudioVideoEditing</Category>
-              <Category>Player</Category>
-              <Category>Recorder</Category>
-              <Category>HamRadio</Category>
-            </Or>
-          </And>
-          <And>
-            <Category>AudioVideo</Category>
-            <Category>Music</Category>
-          </And>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Video</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>MandrivaLinux-Multimedia-Video-Totem Movie Player.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-multimedia-video.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Multimedia-Video</Category>
-          <Category>Video</Category>
-          <Category>TV</Category>
-          <And>
-            <Category>Video</Category>
-            <Or>
-              <Category>AudioVideoEditing</Category>
-              <Category>Player</Category>
-              <Category>Recorder</Category>
-            </Or>
-          </And>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Other</Name>
-      <Directory>mandriva-multimedia-other.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-Multimedia-Other</Category>
-        </Or>
-      </Include>
-    </Menu>
-  </Menu>
-  <Menu>
-    <Name>System</Name>
-    <Layout>
-      <Menuname>Terminals</Menuname>
-      <Menuname>Text Tools</Menuname>
-      <Menuname>Configuration</Menuname>
-      <Menuname>Archiving</Menuname>
-      <Menuname>File Tools</Menuname>
-      <Menuname>Monitoring</Menuname>
-      <Menuname>Session</Menuname>
-      <Merge type="menus"/>
-      <Merge type="files"/>
-    </Layout>
-    <Directory>mandriva-system.directory</Directory>
-    <OnlyUnallocated/>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-System</Category>
-        <Category>System</Category>
-        <Category>Filesystem</Category>
-        <And>
-          <Category>System</Category>
-          <Category>Security</Category>
-        </And>
-      </Or>
-    </Include>
-    <Menu>
-      <Name>Archiving</Name>
-      <Layout>
-        <Menuname>Backup</Menuname>
-        <Menuname>CD Burning</Menuname>
-        <Menuname>Compression</Menuname>
-        <Menuname>Other</Menuname>
-        <Merge type="menus"/>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-system-archiving.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-System-Archiving</Category>
-        </Or>
-      </Include>
-      <Menu>
-        <Name>Backup</Name>
-        <Layout>
-          <Merge type="menus"/>
-          <Filename>MandrivaLinux-System-Archiving-Backup-DrakSync.desktop</Filename>
-          <Merge type="files"/>
-        </Layout>
-        <Directory>mandriva-system-archiving-backup.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Archiving-Backup</Category>
-            <Category>Archiving</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>CD Burning</Name>
-        <Layout>
-          <Merge type="menus"/>
-          <Filename>kde-k3b.desktop</Filename>
-          <Merge type="files"/>
-        </Layout>
-        <Directory>mandriva-system-archiving-cdburning.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Archiving-CDBurning</Category>
-            <Category>DiscBurning</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Compression</Name>
-        <Directory>mandriva-system-archiving-compression.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Archiving-Compression</Category>
-            <Category>Compression</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Other</Name>
-        <Directory>mandriva-system-archiving-other.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Archiving-Other</Category>
-          </Or>
-        </Include>
-      </Menu>
-    </Menu>
-    <Menu>
-      <Name>Configuration</Name>
-      <Layout>
-        <Filename>kde-KControl.desktop</Filename>
-        <Filename>MandrivaLinux-System-Configuration-Configure Your Computer.desktop</Filename>
-        <Menuname>Boot and Init</Menuname>
-        <Menuname>KDE</Menuname>
-        <Menuname>GNOME</Menuname>
-        <Menuname>Hardware</Menuname>
-        <Menuname>Networking</Menuname>
-        <Menuname>Packaging</Menuname>
-        <Menuname>Printing</Menuname>
-        <Merge type="menus"/>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-system-configuration.directory</Directory>
-      <OnlyUnallocated/>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-System-Configuration</Category>
-          <And>
-            <Category>Settings</Category>
-            <Category>DesktopSettings</Category>
-            <Category>HardwareSettings</Category>
-            <Not>
-              <Category>GNOME</Category>
-              <Category>KDE</Category>
-            </Not>
-          </And>
-        </Or>
-      </Include>
-      <Menu>
-        <Name>Boot and Init</Name>
-        <Directory>mandriva-system-configuration-bootandinit.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Configuration-BootandInit</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Hardware</Name>
-        <Directory>mandriva-system-configuration-hardware.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Configuration-Hardware</Category>
-            <Category>HardwareSettings</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>GNOME</Name>
-        <Directory>mandriva-system-configuration-gnome.directory</Directory>
-        <Include>
-          <Category>X-MandrivaLinux-System-Configuration-GNOME</Category>
-        </Include>
-        <Menu>
-          <Name>Advanced</Name>
-          <Directory>mandriva-system-configuration-gnome-advanced.directory</Directory>
-          <Include>
-            <Category>X-MandrivaLinux-System-Configuration-GNOME-Advanced</Category>
-          </Include>
-        </Menu>
-      </Menu>
-      <Menu>
-        <Name>KDE</Name>
-        <Directory>mandriva-system-configuration-kde.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Configuration-KDE</Category>
-          </Or>
-        </Include>
-        <Menu>
-          <Name>Accessibility</Name>
-          <Directory>kde-settings-accessibility.directory</Directory>
-          <Include>
-            <Or>
-              <Category>X-MandrivaLinux-System-Configuration-KDE-Accessibility</Category>
-            </Or>
-          </Include>
-        </Menu>
-        <Menu>
-          <Name>Components</Name>
-          <Directory>kde-settings-components.directory</Directory>
-          <Include>
-            <Or>
-              <Category>X-MandrivaLinux-System-Configuration-KDE-Components</Category>
-            </Or>
-          </Include>
-        </Menu>
-        <Menu>
-          <Name>Information</Name>
-          <Directory>kde-settings-hardware.directory</Directory>
-          <Include>
-            <Or>
-              <Category>X-MandrivaLinux-System-Configuration-KDE-Information</Category>
-            </Or>
-          </Include>
-        </Menu>
-        <Menu>
-          <Name>LookNFeel</Name>
-          <Directory>kde-settings-looknfeel.directory</Directory>
-          <Include>
-            <Or>
-              <Category>X-MandrivaLinux-System-Configuration-KDE-LookNFeel</Category>
-            </Or>
-          </Include>
-        </Menu>
-        <Menu>
-          <Name>Network</Name>
-          <Directory>kde-settings-network.directory</Directory>
-          <Include>
-            <Or>
-              <Category>X-MandrivaLinux-System-Configuration-KDE-Network</Category>
-            </Or>
-          </Include>
-        </Menu>
-        <Menu>
-          <Name>Peripherals</Name>
-          <Directory>kde-settings-peripherals.directory</Directory>
-          <Include>
-            <Or>
-              <Category>X-MandrivaLinux-System-Configuration-KDE-Peripherals</Category>
-            </Or>
-          </Include>
-        </Menu>
-        <Menu>
-          <Name>PowerControl</Name>
-          <Directory>kde-settings-power.directory</Directory>
-          <Include>
-            <Or>
-              <Category>X-MandrivaLinux-System-Configuration-KDE-PowerControl</Category>
-            </Or>
-          </Include>
-        </Menu>
-        <Menu>
-          <Name>Security</Name>
-          <Directory>kde-settings-security.directory</Directory>
-          <Include>
-            <Or>
-              <Category>X-MandrivaLinux-System-Configuration-KDE-Security</Category>
-            </Or>
-          </Include>
-        </Menu>
-        <Menu>
-          <Name>Sound</Name>
-          <Directory>kde-settings-sound.directory</Directory>
-          <Include>
-            <Or>
-              <Category>X-MandrivaLinux-System-Configuration-KDE-Sound</Category>
-            </Or>
-          </Include>
-        </Menu>
-        <Menu>
-          <Name>WebBrowsing</Name>
-          <Directory>kde-settings-webbrowsing.directory</Directory>
-          <Include>
-            <Or>
-              <Category>X-MandrivaLinux-System-Configuration-KDE-WebBrowsing</Category>
-            </Or>
-          </Include>
-        </Menu>
-        <Menu>
-          <Name>System</Name>
-          <Directory>kde-settings-system.directory</Directory>
-          <Include>
-            <Or>
-              <Category>X-MandrivaLinux-System-Configuration-KDE-System</Category>
-            </Or>
-          </Include>
-        </Menu>
-      </Menu>
-      <Menu>
-        <Name>Networking</Name>
-        <Directory>mandriva-system-configuration-networking.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Configuration-Networking</Category>
-            <And>
-              <Category>Settings</Category>
-              <Category>Network</Category>
-            </And>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Packaging</Name>
-        <Directory>mandriva-system-configuration-packaging.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Configuration-Packaging</Category>
-            <Category>PackageManager</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Printing</Name>
-        <Directory>mandriva-system-configuration-printing.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Configuration-Printing</Category>
-            <Category>Printing</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Users</Name>
-        <Directory>mandriva-system-configuration-users.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Configuration-Users</Category>
-          </Or>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>Other</Name>
-        <Directory>mandriva-system-configuration-other.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Configuration-Other</Category>
-            <And>
-              <Category>Settings</Category>
-              <Category>Security</Category>
-            </And>
-          </Or>
-        </Include>
-      </Menu>
-    </Menu>
-    <Menu>
-      <Name>File Tools</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-Kfind.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-system-filetools.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-System-FileTools</Category>
-          <Category>FileTool</Category>
-          <Category>FileTools</Category>
-          <Category>FileManager</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Monitoring</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-ksysguard.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-system-monitoring.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-System-Monitoring</Category>
-          <Category>Monitor</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Session</Name>
-      <Directory>mandriva-system-session.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-System-Session</Category>
-        </Or>
-      </Include>
-      <Menu>
-        <Name>Windowmanagers</Name>
-        <Directory>mandriva-system-session-windowmanagers.directory</Directory>
-        <Include>
-          <Or>
-            <Category>X-MandrivaLinux-System-Session-Windowmanagers</Category>
-          </Or>
-        </Include>
-      </Menu>
-    </Menu>
-    <Menu>
-      <Name>Terminals</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-konsole.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-system-terminals.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-System-Terminals</Category>
-          <Category>TerminalEmulator</Category>
-        </Or>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Text Tools</Name>
-      <Layout>
-        <Merge type="menus"/>
-        <Filename>kde-kdict.desktop</Filename>
-        <Merge type="files"/>
-      </Layout>
-      <Directory>mandriva-system-texttools.directory</Directory>
-      <Include>
-        <Or>
-          <Category>X-MandrivaLinux-System-TextTools</Category>
-          <Category>TextTool</Category>
-          <Category>TextTools</Category>
-        </Or>
-      </Include>
-    </Menu>
-  </Menu>
-  <Menu>
-    <Name>Other</Name>
-    <Directory>mandriva-other.directory</Directory>
-    <OnlyUnallocated/>
-<!--
-    <Include>
-	    <Or>
-		    <Category>X-MandrivaLinux-Other</Category>
-	    </Or>
-    </Include>-->
-  </Menu>
-  <Menu>
-    <Name>.hidden</Name>
-    <Directory>mandriva-hidden.directory</Directory>
-    <Include>
-      <Or>
-        <Category>X-MandrivaLinux-.hidden</Category>
-      </Or>
-    </Include>
-  </Menu>
-  <MergeFile>applications-kmenuedit.menu</MergeFile>
-</Menu>
diff --git a/menu/applications.menu.in b/menu/applications.menu.in
new file mode 100644
index 0000000..85a4aa3
--- /dev/null
+++ b/menu/applications.menu.in
@@ -0,0 +1,863 @@
+<?xml version="1.0"?>
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
+<Menu>
+  <Name>Applications</Name>
+  <Layout>
+    <Menuname>Internet</Menuname>
+    <Menuname>Office</Menuname>
+    <Menuname>Graphics</Menuname>
+    <Menuname>SoundVideo</Menuname>
+    <Menuname>Accessories</Menuname>
+    <Menuname>Development</Menuname>
+    <Menuname>Games</Menuname>
+    <Menuname>Education</Menuname>
+    <Menuname>Sciences</Menuname>
+    <Menuname>Documentation</Menuname>
+    <Merge type="menus"/>
+    <Merge type="files"/>
+    <Separator/>
+    <Filename>mandriva-rpmdrake-root.desktop</Filename>
+  </Layout>
+  <DefaultLayout>
+    <Merge type="files"/>
+    <Menuname>More</Menuname>
+    <Merge type="menus"/>
+  </DefaultLayout>
+  <DefaultMergeDirs/>
+  <KDELegacyDirs/>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>mandrivalinux.directory</Directory>
+  <Include>
+    <Or>
+      <Category>X-MandrivaLinux</Category>
+      <Filename>mandriva-rpmdrake-root.desktop</Filename>
+    </Or>
+  </Include>
+  <Menu>
+    <Name>Internet</Name>
+    <Directory>mandriva-internet.directory</Directory>
+    <Include>
+      <And>
+        <Or>
+          <Category>@MAIN_DESKTOP@</Category>
+          <Category>@MAIN_TOOLKIT@</Category>
+          <Category>X-MandrivaLinux-CrossDesktop</Category>
+        </Or>
+        <Or>
+          <Category>X-MandrivaLinux-Internet</Category>
+          <Category>Network</Category>
+        </Or>
+        <Not>
+          <Category>WebDevelopment</Category>
+        </Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>More</Name>
+      <Directory>mandriva-internet-more.directory</Directory>
+      <Include>
+        <And>
+          <Not>
+            <Or>
+              <Category>@MAIN_DESKTOP@</Category>
+              <Category>@MAIN_TOOLKIT@</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+              <Category>WebDevelopment</Category>
+            </Or>
+          </Not>
+          <Or>
+            <Category>Network</Category>
+          </Or>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Office</Name>
+    <Directory>mandriva-office.directory</Directory>
+    <Layout>
+      <Filename>writer2.2.desktop</Filename>
+      <Filename>calc2.2.desktop</Filename>
+      <Filename>impress2.2.desktop</Filename>
+      <Separator/>
+      <Merge type="all"/>
+    </Layout>
+    <Include>
+      <And>
+        <Or>
+          <Category>@MAIN_DESKTOP@</Category>
+          <Category>@MAIN_TOOLKIT@</Category>
+          <Category>X-MandrivaLinux-CrossDesktop</Category>
+        </Or>
+        <Or>
+          <Category>X-MandrivaLinux-Office</Category>
+          <Category>Office</Category>
+        </Or>
+        <Not>
+          <Category>Utility</Category>
+        </Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>Other</Name>
+      <Directory>mandriva-office-more.directory</Directory>
+      <Include>
+        <And>
+          <Not>
+            <Or>
+              <Category>@MAIN_DESKTOP@</Category>
+              <Category>@MAIN_TOOLKIT@</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+            </Or>
+          </Not>
+          <Or>
+            <Category>Office</Category>
+            <Category>X-MandrivaLinux-Office-Other</Category>
+          </Or>
+          <Not>
+            <Category>Utility</Category>
+          </Not>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Graphics</Name>
+    <Directory>mandriva-graphics.directory</Directory>
+    <Include>
+      <And>
+        <Or>
+          <Category>@MAIN_DESKTOP@</Category>
+          <Category>@MAIN_TOOLKIT@</Category>
+          <Category>X-MandrivaLinux-CrossDesktop</Category>
+        </Or>
+        <Or>
+          <Category>X-MandrivaLinux-Multimedia-Graphics</Category>
+          <Category>Graphics</Category>
+        </Or>
+      </And>
+    </Include>
+    <Menu>
+      <Name>Other</Name>
+      <Directory>mandriva-graphics-other.directory</Directory>
+      <Include>
+        <And>
+          <Not>
+            <Or>
+              <Category>@MAIN_DESKTOP@</Category>
+              <Category>@MAIN_TOOLKIT@</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+            </Or>
+          </Not>
+          <Or>
+            <Category>Graphics</Category>
+          </Or>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>SoundVideo</Name>
+    <Directory>mandriva-soundvideo.directory</Directory>
+    <Include>
+      <And>
+        <Or>
+          <Category>@MAIN_DESKTOP@</Category>
+          <Category>@MAIN_TOOLKIT@</Category>
+          <Category>X-MandrivaLinux-CrossDesktop</Category>
+        </Or>
+        <Or>
+          <Category>X-MandrivaLinux-Multimedia</Category>
+          <Category>X-MandrivaLinux-Multimedia-Sound</Category>
+          <Category>X-MandrivaLinux-Multimedia-Video</Category>
+          <Category>AudioVideo</Category>
+          <Category>Audio</Category>
+          <Category>Video</Category>
+        </Or>
+      </And>
+    </Include>
+    <Menu>
+      <Name>Other</Name>
+      <Directory>mandriva-soundvideo-other.directory</Directory>
+      <Include>
+        <And>
+          <Not>
+            <Or>
+              <Category>@MAIN_DESKTOP@</Category>
+              <Category>@MAIN_TOOLKIT@</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+            </Or>
+          </Not>
+          <Or>
+            <Category>X-MandrivaLinux-Multimedia-Other</Category>
+            <Category>X-MandrivaLinux-Multimedia-Sound</Category>
+            <Category>X-MandrivaLinux-Multimedia-Video</Category>
+            <Category>AudioVideo</Category>
+          </Or>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Tools</Name>
+    <Directory>mandriva-tools.directory</Directory>
+    <Layout>
+      <Menuname>SystemTools</Menuname>
+      <Menuname>Accessibility</Menuname>
+      <Menuname>Emulator</Menuname>
+      <Merge type="files"/>
+      <Menuname>Other</Menuname>
+      <Merge type="dirs"/>
+    </Layout>
+    <Include>
+      <And>
+        <Or>
+          <Category>@MAIN_DESKTOP@</Category>
+          <Category>@MAIN_TOOLKIT@</Category>
+          <Category>X-MandrivaLinux-CrossDesktop</Category>
+        </Or>
+        <Or>
+          <Category>Utility</Category>
+          <Category>TextEditor</Category>
+          <And>
+            <Category>Settings</Category>
+            <Not>
+              <Category>KDE</Category>
+            </Not>
+          </And>
+        </Or>
+        <Not>
+          <Category>Accessibility</Category>
+          <Category>Monitor</Category>
+          <Category>System</Category>
+          <Category>Emulator</Category>
+        </Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>SystemTools</Name>
+      <Directory>mandriva-systemtools.directory</Directory>
+      <Layout>
+        <Filename>mandriva-drakconf.desktop</Filename>
+        <Separator/>
+        <Merge type="all"/>
+      </Layout>
+      <Include>
+        <Or>
+          <And>
+            <Not>
+              <Category>@MAIN_DESKTOP@</Category>
+            </Not>
+            <Category>HardwareSettings</Category>
+          </And>
+          <And>
+            <Or>
+              <Category>@MAIN_TOOLKIT@</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+            </Or>
+            <Or>
+              <Category>System</Category>
+              <Category>Monitor</Category>
+            </Or>
+          </And>
+          <Filename>mandriva-drakconf.desktop</Filename>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Accessibility</Name>
+      <Directory>mandriva-accessibility.directory</Directory>
+      <Include>
+        <And>
+          <Not>
+            <Category>Settings</Category>
+          </Not>
+          <Or>
+            <Category>Accessibility</Category>
+          </Or>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Emulators</Name>
+      <Directory>mandriva-emulators.directory</Directory>
+      <Include>
+        <Category>Emulator</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Other</Name>
+      <Directory>mandriva-tools-other.directory</Directory>
+      <Include>
+        <And>
+          <Not>
+            <Category>@MAIN_DESKTOP@</Category>
+          </Not>
+          <Not>
+            <Category>@MAIN_TOOLKIT@</Category>
+          </Not>
+          <Category>X-MandrivaLinux-CrossDesktop</Category>
+          <Not>
+            <Category>Accessibility</Category>
+          </Not>
+          <Or>
+            <Category>Utility</Category>
+            <Category>System</Category>
+            <Category>TextEditor</Category>
+          </Or>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Development</Name>
+    <Layout>
+      <Menuname>Databases</Menuname>
+      <Menuname>Development Environment</Menuname>
+      <Menuname>Web Development</Menuname>
+      <Menuname>Interpreters</Menuname>
+      <Menuname>Tools</Menuname>
+      <Menuname>Code Generators</Menuname>
+      <Menuname>Other</Menuname>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Directory>mandriva-development.directory</Directory>
+    <Include>
+      <And>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Development</Category>
+          <Category>Development</Category>
+        </Or>
+        <Not>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Development-Tools</Category>
+            <Category>X-MandrivaLinux-MoreApplications-Development-Other</Category>
+            <Category>Building</Category>
+            <Category>Profiling</Category>
+            <Category>Debugger</Category>
+            <Category>RevisionControl</Category>
+            <Category>Translation</Category>
+            <Category>IDE</Category>
+            <Category>GUIDesigner</Category>
+            <Category>X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments</Category>
+            <Category>WebDevelopment</Category>
+          </Or>
+        </Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>Databases</Name>
+      <Directory>mandriva-development-databases.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Databases</Category>
+          <Category>Database</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Development Environments</Name>
+      <Directory>mandriva-development-developmentenvironments.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments</Category>
+          <Category>IDE</Category>
+          <Category>GUIDesigner</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Web Development</Name>
+      <Directory>mandriva-development-webdevelopment.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Internet-WebEditors</Category>
+          <Category>WebDevelopment</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Tools</Name>
+      <Directory>mandriva-development-tools.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Development-Other</Category>
+          <Category>X-MandrivaLinux-MoreApplications-Development-Tools</Category>
+          <Category>X-MandrivaLinux-MoreApplications-Development-Interpreters</Category>
+          <Category>Building</Category>
+          <Category>Profiling</Category>
+          <Category>Debugger</Category>
+          <Category>RevisionControl</Category>
+          <And>
+            <Category>Development</Category>
+            <Category>Translation</Category>
+          </And>
+        </Or>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Games</Name>
+    <Layout>
+      <Menuname>Adventure</Menuname>
+      <Menuname>Arcade</Menuname>
+      <Menuname>Boards</Menuname>
+      <Menuname>Cards</Menuname>
+      <Menuname>Puzzles</Menuname>
+      <Menuname>Sports</Menuname>
+      <Menuname>Strategy</Menuname>
+      <Menuname>Toys</Menuname>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Directory>mandriva-games.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-MoreApplications-Games</Category>
+        <Category>Game</Category>
+      </Or>
+    </Include>
+    <Menu>
+      <Name>Adventure</Name>
+      <Directory>mandriva-games-adventure.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Games-Adventure</Category>
+          <Category>AdventureGame</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Arcade</Name>
+      <Directory>mandriva-games-arcade.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Games-Arcade</Category>
+          <Category>ArcadeGame</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Boards</Name>
+      <Directory>mandriva-games-boards.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Games-Boards</Category>
+          <Category>BoardGame</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Cards</Name>
+      <Directory>mandriva-games-cards.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Games-Cards</Category>
+          <Category>CardGame</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Puzzles</Name>
+      <Directory>mandriva-games-puzzles.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Games-Puzzles</Category>
+          <Category>LogicGame</Category>
+          <Category>BlocksGame</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Sports</Name>
+      <Directory>mandriva-games-sports.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Games-Sports</Category>
+          <Category>SportsGame</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Strategy</Name>
+      <Directory>mandriva-games-strategy.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Games-Strategy</Category>
+          <Category>StrategyGame</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Other</Name>
+      <Directory>mandriva-games-other.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Games-Other</Category>
+          <Category>KidsGame</Category>
+          <Category>RolePlaying</Category>
+          <Category>Simulation</Category>
+          <Category>ActionGame</Category>
+          <And>
+            <Category>Game</Category>
+            <Category>Emulator</Category>
+          </And>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Toys</Name>
+      <Directory>mandriva-games-toys.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Games-Toys</Category>
+          <Category>Amusement</Category>
+        </Or>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Education</Name>
+    <Layout>
+      <Menuname>Economy</Menuname>
+      <Menuname>Geography</Menuname>
+      <Menuname>History</Menuname>
+      <Menuname>Languages</Menuname>
+      <Menuname>Literature</Menuname>
+      <Menuname>Sciences</Menuname>
+      <Menuname>Sports</Menuname>
+      <Menuname>Other</Menuname>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Directory>mandriva-education.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-MoreApplications-Education</Category>
+        <Category>Education</Category>
+      </Or>
+    </Include>
+    <Menu>
+      <Name>Economy</Name>
+      <Directory>mandriva-education-economy.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Education-Economy</Category>
+          <Category>Economy</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Geography</Name>
+      <Directory>mandriva-education-geography.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Education-Geography</Category>
+          <Category>Geography</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>History</Name>
+      <Directory>mandriva-education-history.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Education-History</Category>
+          <Category>History</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Languages</Name>
+      <Directory>mandriva-education-languages.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Education-Languages</Category>
+          <Category>Languages</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Literature</Name>
+      <Directory>mandriva-education-literature.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Education-Literature</Category>
+          <Category>Literature</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Sciences</Name>
+      <Directory>mandriva-education-sciences.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Education-Sciences</Category>
+          <And>
+            <Category>Science</Category>
+            <Category>Education</Category>
+          </And>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Sports</Name>
+      <Directory>mandriva-education-sports.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Education-Sports</Category>
+          <Category>Sports</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Other</Name>
+      <Directory>mandriva-education-other.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Education-Other</Category>
+          <Category>Art</Category>
+          <Category>Construction</Category>
+          <Category>Teaching</Category>
+          <And>
+            <Category>Education</Category>
+            <Category>Music</Category>
+          </And>
+        </Or>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Sciences</Name>
+    <Layout>
+      <Menuname>Artificial Intelligence</Menuname>
+      <Menuname>Astronomy</Menuname>
+      <Menuname>Biology</Menuname>
+      <Menuname>Chemistry</Menuname>
+      <Menuname>Computer Science</Menuname>
+      <Menuname>Data Visualization</Menuname>
+      <Menuname>Electricity</Menuname>
+      <Menuname>Geosciences</Menuname>
+      <Menuname>Image Processing</Menuname>
+      <Menuname>Mathematics</Menuname>
+      <Menuname>Numeric Analysis</Menuname>
+      <Menuname>Parallel Computing</Menuname>
+      <Menuname>Physics</Menuname>
+      <Menuname>Robotics</Menuname>
+      <Menuname>Other</Menuname>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Directory>mandriva-sciences.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences</Category>
+        <Category>Science</Category>
+      </Or>
+    </Include>
+    <Menu>
+      <Name>Artificial Intelligence</Name>
+      <Directory>mandriva-sciences-artificialintelligence.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-ArtificialIntelligence</Category>
+          <Category>ArtificialIntelligence</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Astronomy</Name>
+      <Directory>mandriva-sciences-astronomy.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-Astronomy</Category>
+          <Category>Astronomy</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Biology</Name>
+      <Directory>mandriva-sciences-biology.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-Biology</Category>
+          <Category>Biology</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Chemistry</Name>
+      <Directory>mandriva-sciences-chemistry.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-Chemistry</Category>
+          <Category>Chemistry</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Computer Science</Name>
+      <Directory>mandriva-sciences-computerscience.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-ComputerScience</Category>
+          <Category>ComputerScience</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Data Visualization</Name>
+      <Directory>mandriva-sciences-datavisualization.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-DataVisualization</Category>
+          <Category>DataVisualization</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Electricity</Name>
+      <Directory>mandriva-sciences-electricity.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-Electricity</Category>
+          <Category>Electricity</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Geosciences</Name>
+      <Directory>mandriva-sciences-geosciences.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-Geosciences</Category>
+          <Category>Geoscience</Category>
+          <Category>Geology</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Image Processing</Name>
+      <Directory>mandriva-sciences-imageprocessing.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-ImageProcessing</Category>
+          <Category>ImageProcessing</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Mathematics</Name>
+      <Directory>mandriva-sciences-mathematics.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-Mathematics</Category>
+          <Category>Math</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Numeric Analysis</Name>
+      <Directory>mandriva-sciences-numericanalysis.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-NumericAnalysis</Category>
+          <Category>NumericAnalysis</Category>
+          <Category>NumericalAnalysis</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Parallel Computing</Name>
+      <Directory>mandriva-sciences-parallelcomputing.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-ParallelComptuting</Category>
+          <Category>ParallelComptuting</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Physics</Name>
+      <Directory>mandriva-sciences-physics.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-Physics</Category>
+          <Category>Physics</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Robotics</Name>
+      <Directory>mandriva-sciences-robotics.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-Robotics</Category>
+          <Category>Robotics</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Other</Name>
+      <Directory>mandriva-sciences-other.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category>
+          <Category>MedicalSoftware</Category>
+          <Category>Electronics</Category>
+          <Category>Engineering</Category>
+        </Or>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Documentation</Name>
+    <Directory>mandriva-documentation.directory</Directory>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-MoreApplications-Documentation</Category>
+        <Category>Documentation</Category>
+      </Or>
+    </Include>
+  </Menu>
+  <!--
+    <Menu>
+	    <Name>@MAIN_DESKTOP@ Preferences</Name>
+    <Directory>mandriva-system-configuration.directory</Directory>
+      <Include>
+	      <And>
+		      <Category>@MAIN_DESKTOP@</Category>
+        <Or>
+          <Category>Settings</Category>
+          <Category>DesktopSettings</Category>
+  </Or>
+  </And>
+      </Include>
+    </Menu>
+  <Menu>
+    <Name>Other</Name>
+    <Directory>mandriva-other.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+	    <All/>
+    </Include>
+    <Exclude>
+	    <Category>Core</Category>
+    </Exclude>
+  </Menu>-->
+  <Menu>
+    <Name>.hidden</Name>
+    <Directory>mandriva-hidden.directory</Directory>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-.hidden</Category>
+      </Or>
+    </Include>
+  </Menu>
+  <MergeFile>applications-kmenuedit.menu</MergeFile>
+</Menu>
diff --git a/menu/defaultlayout-simplified.menu b/menu/defaultlayout-simplified.menu
deleted file mode 100644
index 2a6b074..0000000
--- a/menu/defaultlayout-simplified.menu
+++ /dev/null
@@ -1,22 +0,0 @@
-<Menu>
-<Name>Mandrakelinux</Name>
-<Layout>
-<Menuname>Use Office Tools</Menuname>
-<Menuname>Organize</Menuname>
-<Menuname>Surf the Internet</Menuname>
-<Menuname>Enjoy Music and Video</Menuname>
-<Menuname>View, Modify and Create Graphics</Menuname>
-<Menuname>Play Games</Menuname>
-<Menuname>Administer Your System</Menuname>
-<Menuname>Read Documentation</Menuname>
-<Menuname>Develop</Menuname>
-<Menuname>Use Education Software</Menuname>
-<Menuname>Use Scientific Software</Menuname>
-<Menuname>Use Emulators</Menuname>
-<Menuname>Use More Applications</Menuname>
-<Merge type="menus"/>
-<Merge type="files"/>
-<Separator/>
-<Menuname>Other</Menuname>
-</Layout>
-</Menu>
diff --git a/menu/defaultlayout.menu b/menu/defaultlayout.menu
deleted file mode 100644
index d981f45..0000000
--- a/menu/defaultlayout.menu
+++ /dev/null
@@ -1,13 +0,0 @@
-<Menu>
-<Name>Mandrakelinux</Name>
-<Layout>
-<Menuname>Office</Menuname>
-<Menuname>Internet</Menuname>
-<Menuname>Multimedia</Menuname>
-<Menuname>System</Menuname>
-<Menuname>More Applications</Menuname>
-<Menuname>Other</Menuname>
-<Merge type="menus"/>
-<Merge type="files"/>
-</Layout>
-</Menu>
diff --git a/menu/desktop-common-data b/menu/desktop-common-data
deleted file mode 100644
index fbef1ac..0000000
--- a/menu/desktop-common-data
+++ /dev/null
@@ -1,255 +0,0 @@
-## Use Office Tools
-# Create a Text Document
-?package(OpenOffice.org): needs="x11" section="Use Office Tools" icon="ooo_writer.png" title="Create a Text Document" command="oowriter" mimetypes="application/vnd.sun.xml.writer,application/vnd.stardivision.writer,application/msword,application/vnd.ms-word,application/x-doc,text/rtf"
-
-# Create a Spreadsheet
-?package(OpenOffice.org): needs="x11" section="Use Office Tools" icon="ooo_calc.png" title="Create a Spreadsheet" command="oocalc" mimetypes="application/vnd.sun.xml.calc,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/msexcel,application/vnd.ms-excel"
-
-# Create a Presentation
-?package(OpenOffice.org): needs="x11" section="Use Office Tools" icon="ooo_impress.png" title="Create a Presentation" command="ooimpress" mimetypes="application/vnd.sun.xml.impress;application/vnd.stardivision.impress;application/mspowerpoint"
-
-# Create a Drawing
-?package(OpenOffice.org): needs=x11 section="Use Office Tools" icon="ooo_draw.png" title="Create a Drawing" command="oodraw" mimetypes="application/vnd.sun.xml.draw,application/vnd.stardivision.draw"
-
-
-# Diagrams
-?package(koffice-kivio): needs="kde" kde_filename="kivio" section="Use Office Tools" title="Create Flowcharts and Diagrams" icon="kivio.png" command="kivio" kde_command="kivio %u" mimetypes="application/x-kivio" multiple_files="false" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nGenericName=Flowchart & Diagram Editing\\nX-KDE-NativeMimeType=application/x-kivio\\nDocPath=kivio/index.html\\nX-DCOP-ServiceType=Multi"
-?package(dia): needs="gnome" section="Use Office Tools" title="Create Flowcharts and Diagrams" icon="dia.png" command="dia" mimetypes="application/x-kivio" 
-
-# Design a Layout
-?package(scribus): needs="x11" section="Use Office Tools" command="scribus" title="Design a Layout" needs="x11" icon="wordprocessor_section.png"
-
-# Consult an Address Book
-?package(evolution): needs="gnome" section="Use Office Tools" title="Consult an Address Book" icon="evolution.png" command="evolution -c contacts" 
-
-?package(kdepim-kaddressbook): needs="kde" kde_filename="kontact-kaddressbook" section="Use Office Tools" title="Consult an Address Book" icon="kontact-mdk.png" command="kontact --module kaddressbook" kde_command="kontact --module kaddressbook %u" mimetypes="text/x-vcard,text/x-ldif" multiple_files="false" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nDocPath=kaddressbook/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nX-DCOP-ServiceName=kaddressbook\\nServiceTypes=KParts/ReadOnlyPart,Browser/View,DCOP/AddressBook\\nX-KDE-Library=libkaddressbookpart\\n"
-
-# Send a Fax
-?package(kdebase-kdeprintfax): 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="\\nEncoding=UTF-8\\nGenericName=Fax Utility\\nMiniIcon=kdeprintfax\\nTerminal=0\\nX-DCOP-ServiceType=Multi\\n"
-
-# View a Fax
-?package(kdegraphics-kfax): needs="x11" kde_filename="kfax" section="Use Office Tools" title="View a Fax" icon="kfax.png" command="kfax" kde_command="kfax %f   -caption \"%c\" %i %m" mimetypes="image/fax-g3" multiple_files="false" accept_url="false" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=kfax;\\nGenericName=Fax Viewer\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-
-# Synchronize Your PDA
-?package(kdepim-kpilot): needs="kde" kde_filename="kpilot" section="Use Office Tools" title="Synchronize Your PDA" icon="kpilot.png" command="kpilot" kde_opt="\\nEncoding=UTF-8\\nGenericName=PalmPilot Tool\\nDocPath=kpilot/index.html\\nTerminal=0\\nMiniIcon=kpilot\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
-?package(gnome-pilot): needs="gnome" section="Use Office Tools" title="Synchronize Your PDA" icon="/usr/share/pixmaps/gnome-palm.png" command="gpilotd-control-applet" 
-
-# Use a Calculator
-?package(kdeutils-kcalc): needs="kde" kde_filename="kcalc" section="Use Office Tools" title="Use a Calculator" icon="kcalc.png" command="kcalc" kde_command="kcalc  -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nDocPath=kcalc/index.html\\nGenericName=Scientific Calculator\\nTerminal=0\\nX-KDE-StartupNotify=true\\n"
-?package(gcalctool): needs="gnome" section="Use Office Tools" title="Use a Calculator" icon="gcalctool.png" command="gcalctool" 
-
-# Search Dictionaries and Encyclopedias
-?package(kdenetwork-kdict): needs="x11" kde_filename="kdict" section="Use Office Tools" title="Search Dictionaries and Encyclopedias" icon="kdict.png" command="kdict" kde_command="kdict -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nTerminal=0\\nGenericName=Online Dictionary\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nDocPath=kdict/index.html\\n"
-
-
-## Organize
-# Write Notes
-?package(kdepim-knotes): needs="x11" kde_filename="kontact-knotes" section="Organize" title="Write Notes" icon="kontact-mdk.png" command="kontact --module knotes" kde_opt="\\nEncoding=UTF-8\\nDocPath=knotes/index.html\\nTerminal=0\\nGenericName=Popup Notes\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
-
-# Manage Tasks
-?package(kdepim-korganizer): needs="kde" kde_filename="kontact-korganizer" section="Organize" title="Manage Tasks" icon="kontact-mdk.png" command="kontact --module todo" mimetypes="text/calendar,text/x-vcalendar" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=korganizer;\\nTerminalOptions=\\nPath=\\nDocPath=korganizer/index.html\\nTerminal=0\\nGenericName=Personal Organizer\\nServiceTypes=Browser/View,DCOP/Organizer\\nX-KDE-Library=libkorganizerpart\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nX-DCOP-ServiceName=korganizer\\n"
-
-?package(evolution): needs="gnome" section="Organize" title="Manage Tasks" icon="evolution.png" command="evolution -c tasks" 
-
-# Organize Your Time
-?package(kdepim-korganizer): needs="kde" kde_filename="kontact-korganizer-time" section="Organize" title="Organize Your Time" icon="kontact-mdk.png" command="kontact --module korganizer" mimetypes="text/calendar,text/x-vcalendar" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=korganizer;\\nTerminalOptions=\\nPath=\\nDocPath=korganizer/index.html\\nTerminal=0\\nGenericName=Personal Organizer\\nServiceTypes=Browser/View,DCOP/Organizer\\nX-KDE-Library=libkorganizerpart\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nX-DCOP-ServiceName=korganizer\\n"
-
-?package(evolution): needs="gnome" section="Organize" title="Organize Your Time" icon="evolution.png" command="evolution -c calendar" 
-
-# Track Time Spent on Tasks
-?package(kdepim-karm): needs="x11" kde_filename="karm" section="Organize" title="Track Time Spent on Tasks" icon="karm.png" command="karm" kde_command="karm  -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nGenericName=Personal Time Tracker\\nTerminalOptions=\\nPath=\\nDocPath=karm/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-
-# Manage Projects
-?package(planner):command="planner" needs="x11" section="Organize" title="Manage Projects" icon="/usr/share/pixmaps/gnome-planner.png" startup_notify="true"
-
-# Manage Your Finances
-?package(gnucash): command="/usr/bin/gnucash" icon="gnucash.png" needs="X11" section="Organize" title="Manage Your Finances"
-
-
-
-## Surf the Internet
-# Connect to the Internet
-?package(kdenetwork-kppp): needs="x11" kde_filename="Kppp" section="Surf the Internet" title="Dial up" icon="kppp.png" command="kppp" kde_command="kppp %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nGenericName=Internet Dial-up Tool\\nBinaryPattern=kppp;\\nDocPath=kppp/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-
-# Browse the Web
-?package(mozilla-firefox): needs="x11" command="/usr/bin/mozilla-firefox" icon="mozilla-firefox.png" section="Surf the Internet" title="Browse the Web" startup_notify="true" longtitle="Lightweight Web Browser" accept_url="true" mimetypes="text/html,text/xml,application/xhtml+xml,application/vnd.mozilla.xul+xml,text/mml"
-
-?package(epiphany): needs="gnome" section="Surf the Internet" title="Browse the Web" icon="epiphany.png" command="epiphany" startup_notify="true"
-
-# Read and Send E-mail
-?package(kdepim-kmail): needs="kde" kde_filename="kontact-KMail" section="Surf the Internet" title="Read and Send E-mail" icon="kontact-mdk.png" command="kontact --module kmail" kde_command="kontact --module kmail -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nDocPath=kmail/index.html\\nGenericName=Mail Client\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nX-DCOP-ServiceName=kmail\\nServiceTypes=DCOP/ResourceBackend/IMAP\\n"
-
-?package(evolution): needs="gnome" section="Surf the Internet" title="Read and Send E-mail" icon="evolution.png" command="evolution -c mail" startup_notify="true" 
-
-# Chat
-?package(kdenetwork-kopete): needs="kde" kde_filename="kopete" section="Surf the Internet" title="Chat" icon="kopete.png" command="kopete" kde_command="kopete %i %m -caption \"%c\"" kde_opt="\\nGenericName=Instant Messenger\\nTerminal=0\\n"
-?package(gaim): needs="gnome" section="Surf the Internet" title="Chat" icon="gaim.png" command="gaim" startup_notify="true"
-
-# Read and Send Newsgroup Messages
-?package(kdepim-knode): needs="kde" kde_filename="kontact-KNode" section="Surf the Internet" title="Read and Send Newsgroup Messages" icon="kontact-mdk.png" command="kontact --module knode" kde_command="kontact --module kmail -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nTerminal=0\\nDocPath=knode/index.html\\nGenericName=News Reader\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
-
-?package(pan): needs="gnome" section="Surf the Internet" title="Read and Send Newsgroup Messages" icon="pan.png" command="pan" startup_notify="true"
-
-# Make a Phone Call
-?package(kphone): needs="x11" kde_filename="kphone" section="Surf the Internet" title="Make a Phone Call" icon="kphone.png" command="kphone" kde_opt="\\nDocPath=kphone/index.html\\nTerminal=0"
-
-# Organize a Video Conference
-?package(gnomemeeting): command="/usr/bin/gnomemeeting" needs="x11" icon="gnomemeeting.png" section="Surf the Internet" title="Organize a Video Conference" startup_notify="true"
-
-# Create Your Own Web Site
-?package(quanta): needs="x11" kde_filename="quanta" section="Surf the Internet" title="Create Your Own Web Site" icon="quanta.png" command="quanta" mimetypes="text/html" kde_opt="\\nEncoding=UTF-8\\nDocPath=quanta/index.html\\nGenericName=Web Development Environment\\n"
-
-# Transfer Files With FTP
-?package(kbear): needs="kde" kde_filename="kbear" section="Surf the Internet" title="Transfer files with FTP" icon="kbear.png" command="kbear" kde_opt="\\nEncoding=UTF-8\\nGenericName=FTP Client\\nMiniIcon=kbear\\nDocPath=kbear/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique"
-
-?package(gftp): needs="gnome" section="Surf the Internet" title="Transfer Files With FTP" icon="gftp.png" command="gftp" 
-
-
-
-## Enjoy Music and Video
-# Adjust Volume
-?package(kdemultimedia-kmix): needs="kde" kde_filename="kmix" section="Enjoy Music and Video" title="Adjust Volume" icon="kmix.png" command="kmix" kde_command="kmix -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nDocPath=kmix/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nGenericName=Sound Mixer\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
-
-?package(gnome-media): needs="gnome" section="Enjoy Music and Video" title="Adjust Volume" icon="/usr/share/pixmaps/gnome-mixer.png" command="gnome-volume-control" 
-
-# Listen to Audio CDs
-?package(kdemultimedia-kscd): needs="kde" kde_filename="kscd" section="Enjoy Music and Video" title="Listen to Audio CDs" icon="kscd.png" command="kscd" kde_command="kscd -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nGenericName=CD Player\\nBinaryPattern=kscd;\\nDocPath=kscd/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-
-?package(gnome-media): needs="gnome" section="Enjoy Music and Video" title="Listen to Audio CDs" icon="/usr/share/pixmaps/gnome-cd.png" command="gnome-cd" 
-
-# Listen to Music Files
-?package(amarok): needs="kde" kde_filename="amarok" section="Enjoy Music and Video" title="Listen to Music Files" icon="amarok.png" command="amarok" kde_command="amarok %U" mimetypes="application/x-ogg,audio/x-vorbis,audio/basic,audio/x-mod,audio/x-mp3,audio/x-scpls,audio/x-mpegurl,audio/x-sid,audio/x-wav" multiple_files="true" accept_url="true" kde_opt="\\nVersion=0.9.4\\nEncoding=UTF-8\\nInitialPreference=15\\nGenericName=Audio Player\\nDocPath=amarok/index.html\\nTerminal=false\\nActions=Enqueue;\\nX-KDE-StartupNotify=false"
-
-?package(rhythmbox): needs="gnome" section="Enjoy Music and Video" title="Listen to Music Files" icon="rhythmbox.png" command="rhythmbox" startup_notify="true" 
-
-# Rip Audio CDs
-?package(kdemultimedia-kaudiocreator): needs="kde" kde_filename="kaudiocreator" section="Enjoy Music and Video" title="Rip Audio CDs" icon="kaudiocreator.png" command="kaudiocreator" mimetypes="" kde_opt="\\nGenericName=CD Ripper\\nTerminalOptions=\\nPath=\\nTerminal=0\\n"
-
-?package(sound-juicer): needs="gnome" section="Enjoy Music and Video" title="Rip Audio CDs" icon="sound-juicer.png" command="sound-juicer" 
-
-# Record Sounds
-?package(gnome-media): needs="x11" command="/usr/bin/gnome-sound-recorder" section="Enjoy Music and Video" title="Record Sounds" icon="/usr/share/pixmaps/gnome-grecord.png" startup_notify="true"
-
-# Mix Music
-?package(audacity): command="/usr/bin/audacity" needs="X11" icon="audacity.png" section="Enjoy Music and Video" title="Mix Music"
-
-# Compose Music
-?package(rosegarden4): needs="x11" kde_filename="rosegarden" section="Enjoy Music and Video" title="Compose Music" icon="rosegarden.png" command="rosegarden" kde_command="rosegarden -caption \"%c\" %i %m" mimetypes="audio/x-rosegarden,audio/x-rosegarden-device" kde_opt="\\nX-KDE-NativeMimeType=audio/x-rosegarden\\nMiniIcon=rosegarden.png\\nDocPath=rosegarden/index.html\\nTerminal=0"
-
-# Watch Videos
-?package(kaffeine): needs="kde" kde_filename="kaffeine" section="Enjoy Music and Video" title="Watch Videos" icon="kaffeine.png" command="kaffeine" mimetypes="application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine" kde_opt="\\nEncoding=UTF-8\\nGenericName=Mediaplayer\\nServiceTypes=\\nTerminal=false\\nInitialPreference=15"
-
-?package(totem): command="/usr/bin/totem" needs="gnome" section="Enjoy Music and Video" icon="totem.png" mimetypes="video/dv,video/mpeg,video/msvideo,video/quicktime,video/x-anim,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,video/x-nsv,video/x-flc,video/x-fli,application/ogg,application/x-ogg,audio/basic,audio/x-mp3,audio/x-mpeg,audio/mpeg,audio/x-wav,audio/x-mpegurl,audio/x-scpls,audio/x-m4a,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wax,application/vnd.rn-realmedia,audio/x-real-audio,audio-x-pn-realaudio,application/x-flac,audio/x-flac,misc/ultravox,application/x-matroska" accept_url="true" multiple_files="true" title="Watch Videos" startup_notify="true"   
-
-# Edit Videos
-?package(kdenlive): needs="x11" kde_filename="kdenlive" section="Enjoy Music and Video" title="Edit Videos" icon="kdenlive.png" command="kdenlive" kde_command="kdenlive -caption \"%c\" %i %m  " kde_opt="\\nEncoding=UTF-8\\nDocPath=kdenlive/index.html\\nTerminal=0"
-
-# Watch Television
-?package(kdetv): needs="x11" kde_filename="kdetv" section="Enjoy Music and Video" title="Watch Television" icon="kdetv.png" command="kdetv" kde_command="kdetv -caption \"%c\" %i %m" mimetypes="text/x-tv-channels" kde_opt="\\nEncoding=UTF-8\\nMiniIcon=kdetv\\nGenericName=TV Viewer\\nTerminal=0"
-
-
-## View, Modify and Create Graphics
-# View Images and Photos
-?package(kdegraphics-kuickshow): needs="kde" kde_filename="kuickshow" section="View, Modify and Create Graphics" title="View Images and Photos" icon="kuickshow.png" command="kuickshow" kde_command="kuickshow %i %m -caption \"%c\" %U" mimetypes="image/gif,image/x-xpm,image/x-xbm,image/jpeg,image/png,image/tiff,image/x-bmp,image/x-psd,image/x-eim,image/x-portable-bitmap,image/x-portable-pixmap,image/x-portable-greymap" multiple_files="true" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nDocPath=kuickshow/index.html\\nTerminal=0\\nInitialPreference=15\\nGenericName=Image Viewer\\nX-DCOP-ServiceType=Multi"
-
-?package(gqview): needs="gnome" section="View, Modify and Create Graphics" title="View Images and Photos" icon="gqview.png" command="gqview" 
-
-# Edit Images and Photos
-?package(gimp): command="/usr/bin/gimp-remote" icon="wilber-icon.png" section="View, Modify and Create Graphics" title="Edit Images and Photos" 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;image/x-bmp;image/x-xcf" startup_notify="true"
-
-# Scan and Use Optical Character Recognition (OCR) 
-?package(kdegraphics-kooka): needs="x11" kde_filename="kooka" section="View, Modify and Create Graphics" title="Scan and Use Optical Character Recognition (OCR)" icon="scanner.png" command="kooka" kde_command="kooka %i %m %U" multiple_files="true" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nTerminalOptions=\\nPath=\\nTerminal=0\\nBinaryPattern=kooka\\nDocPath=kooka/index.html\\nGenericName=Scan & OCR Program\\nX-DCOP-ServiceType=Multi\\n"
-
-# Import and Sort Your Photos
-?package(digikam): needs="kde" kde_filename="digikam" section="View, Modify and Create Graphics" title="Import and Sort Your Photos" icon="digikam.png" command="digikam" kde_command="digikam -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nDocPath=digikam/index.html\\nTerminal=0"
-
-?package(gtkam): needs="gnome" section="View, Modify and Create Graphics" title="Import and Sort Your Photos" icon="gtkam.png" command="gtkam" 
-
-# Create a Screenshot
-?package(kdegraphics-ksnapshot): needs="kde" kde_filename="ksnapshot" section="View, Modify and Create Graphics" title="Create a Screenshot" icon="ksnapshot.png" command="ksnapshot" kde_command="ksnapshot -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nGenericName=Screen Capture Program\\nBinaryPattern=\\nTerminalOptions=\\nPath=\\nTerminal=0\\nDocPath=ksnapshot/index.html\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-?package(gnome-panel): needs="gnome" section="View, Modify and Create Graphics" title="Create a Screenshot" icon="/usr/share/pixmaps/gnome-screenshot.png" command="gnome-panel-screenshot" 
-
-## Play games
-# Frozen-Bubble
-?package(frozen-bubble):command="/usr/games/frozen-bubble" icon="frozen-bubble.png"   needs="X11" section="Play Games" title="Frozen-Bubble" 
-
-# Armagetron
-?package(armagetron):command="/usr/games/armagetron" 		  icon="armagetron.png" 		  needs="x11" 		  section="Play Games" 		  title="ArmageTron" 
-
-# CannonSmash
-?package(csmash):command="/usr/bin/csmash" icon="csmash.png"   needs="x11" section="Play Games" title="Cannon Smash"
-
-# Chromium B.S.U
-?package(chromium):command="/usr/games/chromium" icon="chromium.png"   needs="x11" section="Play Games" title="Chromium" 
-
-# LBreakout 2
-?package(lbreakout2):needs=x11 section="Play Games" title="LBreakout 2" command="/usr/games/lbreakout2" icon="lbreakout2.png"
-
-# TuxRacer
-?package(tuxracer):command="soundwrapper /usr/games/tuxracer" icon="tuxracer.png" needs="x11" section="Play Games"  title="Tuxracer"
-
-# CrackAttack
-?package(crack-attack): command="/usr/games/crack-attack-solo" icon="crack-attack.png" section="Play Games" title="Crack Attack! - Solo" needs="x11"
-
-
-## Administer Your System
-# Configure Your Desktop
-?package(kdebase-progs): needs="kde" kde_filename="KControl" section="Administer Your System" title="Configure Your Desktop" icon="kcontrol.png" command="kcontrol" kde_command="kcontrol -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nDocPath=kcontrol/index.html\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nNoDisplay=false"
-
-?package(gnome-control-center): needs="gnome" section="Administer Your System" title="Configure Your Desktop" icon="control-center2.png" command="gnome-control-center" 
-
-# Configure Your Computer 
-?package(drakconf): needs="x11" icon="drakconf.png" section="Administer Your System" title="Configure Your Computer" command="/usr/sbin/drakconf"
-
-# Change Your Password
-?package(kdeutils-kdepasswd): needs="kde" kde_filename="kdepasswd" section="Administer Your System" title="Change Your Password" icon="password.png" command="kdepasswd" kde_opt="\\nEncoding=UTF-8\\nTerminalOptions=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-
-?package(usermode): needs="gnome" section="Administer Your System" title="Change Your Password" icon="userpasswd.xpm" command="userpasswd" 
-
-# Burn CDs/DVDs
-?package(k3b): needs="x11" kde_filename="k3b" section="Administer Your System" title="Burn CDs-DVDs" icon="k3b.png" command="k3b" mimetypes="application/x-k3b" kde_opt="\\nDocPath=k3b/index.html\\nTerminal=false\\nX-KDE-NativeMimeType=application/x-k3b\\n"
-
-# Design a CD Cover
-?package(kover): needs="x11" kde_filename="kover" section="Administer Your System" title="Design a CD Cover" icon="kover.png" command="kover" kde_command="kover" kde_mimetype="application/x-kover" kde_opt="\\nTerminal=0"
-
-# Backup Your Data
-?package(drakxtools): needs="x11" icon="drakconf.png" section="Administer Your System" title="Backup Your Data" command="/usr/sbin/drakbackup"
-
-# Compress and Decompress Files
-?package(kdeutils-ark): needs="kde" kde_filename="ark" section="Administer Your System" title="Compress and Decompress Files" icon="ark.png" command="ark" kde_command="ark -caption \"%c\" %i %m %U" mimetypes="application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb" multiple_files="true" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nGenericName=Archiving Tool\\nTerminalOptions=\\nPath=\\nDocPath=ark/index.html\\nTerminal=0\\nSwallowExec=\\nSwallowTitle=\\nBinaryPattern=ark;\\nX-DCOP-ServiceType=Unique\\n"
-
-?package(file-roller): needs="gnome" section="Administer Your System" title="Compress and Decompress Files" icon="file-roller.png" command="file-roller" startup_notify="true"
-
-# Format Floppies
-?package(kdeutils-kfloppy): needs="kde" kde_filename="KFloppy" section="Administer Your System" title="Format Floppies" icon="kfloppy.png" command="kfloppy" kde_command="kfloppy -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nGenericName=Floppy Formatter\\nBinaryPattern=kfloppy;\\nDocPath=kfloppy/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-
-?package(gfloppy): needs="gnome" section="Administer Your System" title="Format Floppies" icon="gfloppy.png" command="gfloppy" 
-
-# Use a Terminal Emulator
-?package(kdebase-konsole): needs="kde" kde_filename="konsole" section="Administer Your System" title="Use a Terminal Emulator" icon="konsole.png" command="konsole" kde_opt="\\nEncoding=UTF-8\\nDocPath=konsole/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nGenericName=Terminal Program\\nX-DCOP-ServiceType=Multi\\nX-KDE-AuthorizeAction=shell_access\\n"
-
-?package(gnome-terminal): needs="gnome" section="Administer Your System" title="Use a Terminal Emulator" icon="gnome-terminal.png" command="gnome-terminal" 
-
-# .hidden
-?package(kdepim-kontact): needs="kde" kde_filename="kontact-summary" section=.hidden title="Kontact" icon="kontact-mdk.png" command="kontact --module summary" kde_opt="\\nEncoding=UTF-8\\nDocPath=knotes/index.html\\nTerminal=0\\nGenericName=Popup Notes\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
-
-
-
-## Read documentation
-# Mandriva Linux documentation in german
-#?package(mandrake-doc-de): command="/usr/bin/www-browser /usr/share/doc/mandriva/de/" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in German" section="Read Documentation"
-
-# Mandriva Linux documentation in english
-?package(mandriva-doc-Discovery-en): command="/usr/bin/www-browser /usr/share/doc/mandriva/en/Discovery/Discovery.html/index.html" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in English" section="Read Documentation"
-
-# Mandriva Linux documentation in spanish
-#?package(mandrake-doc-es): command="/usr/bin/www-browser /usr/share/doc/mandriva/es/" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in Spanish" section="Read Documentation"
-
-# Mandriva Linux documentation in spanish
-?package(mandriva-doc-Discovery-fr): command="/usr/bin/www-browser /usr/share/doc/mandriva/fr/Discovery/Discovery.html/index.html" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in French" section="Read Documentation"
-
-# Mandriva Linux documentation in italian
-#?package(mandrake-doc-it): command="/usr/bin/www-browser /usr/share/doc/mandriva/it/" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in Italian" section="Read Documentation"
-
-# Mandriva Linux documentation in chinese
-#?package(mandrake-doc-zh_cn): command="/usr/bin/www-browser /usr/share/doc/mandriva/zh_cn/" icon="documentation_section.png" needs="x11" title="Mandriva Linux documentation in Chinese" section="Read Documentation"
diff --git a/menu/desktop-directories/mandriva-accessibility.directory.in b/menu/desktop-directories/mandriva-accessibility.directory.in
new file mode 100644
index 0000000..f43220c
--- /dev/null
+++ b/menu/desktop-directories/mandriva-accessibility.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Accessibility
+Icon=accessibility_section
diff --git a/menu/desktop-directories/mandriva-development-databases.directory.in b/menu/desktop-directories/mandriva-development-databases.directory.in
new file mode 100644
index 0000000..53be655
--- /dev/null
+++ b/menu/desktop-directories/mandriva-development-databases.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Databases
+Icon=databases_section
diff --git a/menu/desktop-directories/mandriva-development-developmentenvironments.directory.in b/menu/desktop-directories/mandriva-development-developmentenvironments.directory.in
new file mode 100644
index 0000000..dd6b40e
--- /dev/null
+++ b/menu/desktop-directories/mandriva-development-developmentenvironments.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Development Environments
+Icon=development_environment_section
diff --git a/menu/desktop-directories/mandriva-development-tools.directory.in b/menu/desktop-directories/mandriva-development-tools.directory.in
new file mode 100644
index 0000000..df038a7
--- /dev/null
+++ b/menu/desktop-directories/mandriva-development-tools.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Tools
+Icon=development_tools_section
diff --git a/menu/desktop-directories/mandriva-development-webdevelopment.directory.in b/menu/desktop-directories/mandriva-development-webdevelopment.directory.in
new file mode 100644
index 0000000..477debd
--- /dev/null
+++ b/menu/desktop-directories/mandriva-development-webdevelopment.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Web Development
+Icon=web_editors_section
diff --git a/menu/desktop-directories/mandriva-development.directory.in b/menu/desktop-directories/mandriva-development.directory.in
new file mode 100644
index 0000000..410858c
--- /dev/null
+++ b/menu/desktop-directories/mandriva-development.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Development
+Icon=development_section
diff --git a/menu/desktop-directories/mandriva-documentation.directory.in b/menu/desktop-directories/mandriva-documentation.directory.in
new file mode 100644
index 0000000..c4e892d
--- /dev/null
+++ b/menu/desktop-directories/mandriva-documentation.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Documentation
+Icon=documentation_section
diff --git a/menu/desktop-directories/mandriva-education-economy.directory.in b/menu/desktop-directories/mandriva-education-economy.directory.in
new file mode 100644
index 0000000..582e3c5
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-economy.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Economy
+Icon=education_economy_section
diff --git a/menu/desktop-directories/mandriva-education-geography.directory.in b/menu/desktop-directories/mandriva-education-geography.directory.in
new file mode 100644
index 0000000..738fd42
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-geography.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Geography
+Icon=education_geography_section
diff --git a/menu/desktop-directories/mandriva-education-history.directory.in b/menu/desktop-directories/mandriva-education-history.directory.in
new file mode 100644
index 0000000..80b37e1
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-history.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=History
+Icon=education_history_section
diff --git a/menu/desktop-directories/mandriva-education-languages.directory.in b/menu/desktop-directories/mandriva-education-languages.directory.in
new file mode 100644
index 0000000..c8ad555
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-languages.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Languages
+Icon=education_languages_section
diff --git a/menu/desktop-directories/mandriva-education-literature.directory.in b/menu/desktop-directories/mandriva-education-literature.directory.in
new file mode 100644
index 0000000..8643eb9
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-literature.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Literature
+Icon=education_literature_section
diff --git a/menu/desktop-directories/mandriva-education-other.directory.in b/menu/desktop-directories/mandriva-education-other.directory.in
new file mode 100644
index 0000000..18dc436
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=education_other_section
diff --git a/menu/desktop-directories/mandriva-education-sciences.directory.in b/menu/desktop-directories/mandriva-education-sciences.directory.in
new file mode 100644
index 0000000..b8c71b7
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-sciences.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sciences
+Icon=education_sciences
diff --git a/menu/desktop-directories/mandriva-education-sports.directory.in b/menu/desktop-directories/mandriva-education-sports.directory.in
new file mode 100644
index 0000000..877f2bc
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-sports.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sports
+Icon=education_sport_section
diff --git a/menu/desktop-directories/mandriva-education.directory.in b/menu/desktop-directories/mandriva-education.directory.in
new file mode 100644
index 0000000..edca46a
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Education
+Icon=education_section
diff --git a/menu/desktop-directories/mandriva-emulators.directory.in b/menu/desktop-directories/mandriva-emulators.directory.in
new file mode 100644
index 0000000..273fdab
--- /dev/null
+++ b/menu/desktop-directories/mandriva-emulators.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Emulators
+Icon=emulators_section
diff --git a/menu/desktop-directories/mandriva-games-adventure.directory.in b/menu/desktop-directories/mandriva-games-adventure.directory.in
new file mode 100644
index 0000000..2aa1562
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-adventure.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Adventure
+Icon=adventure_section
diff --git a/menu/desktop-directories/mandriva-games-arcade.directory.in b/menu/desktop-directories/mandriva-games-arcade.directory.in
new file mode 100644
index 0000000..c1b0e90
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-arcade.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Arcade
+Icon=arcade_section
diff --git a/menu/desktop-directories/mandriva-games-boards.directory.in b/menu/desktop-directories/mandriva-games-boards.directory.in
new file mode 100644
index 0000000..18954fa
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-boards.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Boards
+Icon=boards_section
diff --git a/menu/desktop-directories/mandriva-games-cards.directory.in b/menu/desktop-directories/mandriva-games-cards.directory.in
new file mode 100644
index 0000000..2ac788f
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-cards.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Cards
+Icon=cards_section
diff --git a/menu/desktop-directories/mandriva-games-other.directory.in b/menu/desktop-directories/mandriva-games-other.directory.in
new file mode 100644
index 0000000..39f3a69
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=other_amusement
diff --git a/menu/desktop-directories/mandriva-games-puzzles.directory.in b/menu/desktop-directories/mandriva-games-puzzles.directory.in
new file mode 100644
index 0000000..8ce0de8
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-puzzles.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Puzzles
+Icon=puzzle_section
diff --git a/menu/desktop-directories/mandriva-games-sports.directory.in b/menu/desktop-directories/mandriva-games-sports.directory.in
new file mode 100644
index 0000000..abf35c7
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-sports.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sports
+Icon=sport_section
diff --git a/menu/desktop-directories/mandriva-games-strategy.directory.in b/menu/desktop-directories/mandriva-games-strategy.directory.in
new file mode 100644
index 0000000..e034101
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-strategy.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Strategy
+Icon=strategy_section
diff --git a/menu/desktop-directories/mandriva-games-toys.directory.in b/menu/desktop-directories/mandriva-games-toys.directory.in
new file mode 100644
index 0000000..6565d42
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-toys.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Toys
+Icon=toys_section
diff --git a/menu/desktop-directories/mandriva-games.directory.in b/menu/desktop-directories/mandriva-games.directory.in
new file mode 100644
index 0000000..018fb82
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Games
+Icon=amusement_section
diff --git a/menu/desktop-directories/mandriva-graphics.directory.in b/menu/desktop-directories/mandriva-graphics.directory.in
new file mode 100644
index 0000000..5dfcef9
--- /dev/null
+++ b/menu/desktop-directories/mandriva-graphics.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Graphics
+Icon=graphics_section
diff --git a/menu/desktop-directories/mandriva-internet-chat.directory.in b/menu/desktop-directories/mandriva-internet-chat.directory.in
deleted file mode 100644
index a38ac09..0000000
--- a/menu/desktop-directories/mandriva-internet-chat.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Chat
-Icon=chat_section
diff --git a/menu/desktop-directories/mandriva-internet-filetransfer.directory.in b/menu/desktop-directories/mandriva-internet-filetransfer.directory.in
deleted file mode 100644
index 241d150..0000000
--- a/menu/desktop-directories/mandriva-internet-filetransfer.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=File Transfer
-Icon=file_transfer_section
diff --git a/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in b/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in
deleted file mode 100644
index 543bf14..0000000
--- a/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Instant Messaging
-Icon=instant_messaging_section
diff --git a/menu/desktop-directories/mandriva-internet-mail.directory.in b/menu/desktop-directories/mandriva-internet-mail.directory.in
deleted file mode 100644
index 2370cf1..0000000
--- a/menu/desktop-directories/mandriva-internet-mail.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Mail
-Icon=mail_section
diff --git a/menu/desktop-directories/mandriva-internet-more.directory.in b/menu/desktop-directories/mandriva-internet-more.directory.in
new file mode 100644
index 0000000..d8c7289
--- /dev/null
+++ b/menu/desktop-directories/mandriva-internet-more.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=More
+Icon=other_networking
diff --git a/menu/desktop-directories/mandriva-internet-news.directory.in b/menu/desktop-directories/mandriva-internet-news.directory.in
deleted file mode 100644
index 9c3be3d..0000000
--- a/menu/desktop-directories/mandriva-internet-news.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=News
-Icon=news_section
diff --git a/menu/desktop-directories/mandriva-internet-other.directory.in b/menu/desktop-directories/mandriva-internet-other.directory.in
deleted file mode 100644
index f79943a..0000000
--- a/menu/desktop-directories/mandriva-internet-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=other_networking
diff --git a/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in b/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in
deleted file mode 100644
index ccfc817..0000000
--- a/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Remote Access
-Icon=remote_access_section
diff --git a/menu/desktop-directories/mandriva-internet-videoconference.directory.in b/menu/desktop-directories/mandriva-internet-videoconference.directory.in
deleted file mode 100644
index 3aa8bed..0000000
--- a/menu/desktop-directories/mandriva-internet-videoconference.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Video Conference
-Icon=video_conferences_section
diff --git a/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in b/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in
deleted file mode 100644
index 712821a..0000000
--- a/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Web Browsers
-Icon=web_browser_section
diff --git a/menu/desktop-directories/mandriva-internet-webeditors.directory.in b/menu/desktop-directories/mandriva-internet-webeditors.directory.in
deleted file mode 100644
index 1930c53..0000000
--- a/menu/desktop-directories/mandriva-internet-webeditors.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Web Editors
-Icon=web_editors_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in b/menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in
deleted file mode 100644
index f43220c..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Accessibility
-Icon=accessibility_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-databases.directory.in b/menu/desktop-directories/mandriva-moreapplications-databases.directory.in
deleted file mode 100644
index 53be655..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-databases.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Databases
-Icon=databases_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in b/menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in
deleted file mode 100644
index dd6b40e..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Development Environments
-Icon=development_environment_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in b/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in
deleted file mode 100644
index c03f2b7..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Interpreters
-Icon=interpreters_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in b/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in
deleted file mode 100644
index f7a909b..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=development_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in b/menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in
deleted file mode 100644
index df038a7..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Tools
-Icon=development_tools_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-development.directory.in b/menu/desktop-directories/mandriva-moreapplications-development.directory.in
deleted file mode 100644
index 410858c..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-development.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Development
-Icon=development_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-documentation.directory.in b/menu/desktop-directories/mandriva-moreapplications-documentation.directory.in
deleted file mode 100644
index c4e892d..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-documentation.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Documentation
-Icon=documentation_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in
deleted file mode 100644
index 582e3c5..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Economy
-Icon=education_economy_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in
deleted file mode 100644
index 738fd42..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Geography
-Icon=education_geography_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in
deleted file mode 100644
index 80b37e1..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=History
-Icon=education_history_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in
deleted file mode 100644
index c8ad555..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Languages
-Icon=education_languages_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in
deleted file mode 100644
index 8643eb9..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Literature
-Icon=education_literature_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-other.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-other.directory.in
deleted file mode 100644
index 18dc436..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-education-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=education_other_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in
deleted file mode 100644
index b8c71b7..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Sciences
-Icon=education_sciences
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in
deleted file mode 100644
index 877f2bc..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Sports
-Icon=education_sport_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education.directory.in b/menu/desktop-directories/mandriva-moreapplications-education.directory.in
deleted file mode 100644
index edca46a..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-education.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Education
-Icon=education_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-emulators.directory.in b/menu/desktop-directories/mandriva-moreapplications-emulators.directory.in
deleted file mode 100644
index 273fdab..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-emulators.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Emulators
-Icon=emulators_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in b/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in
deleted file mode 100644
index 2aa1562..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Adventure
-Icon=adventure_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in b/menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in
deleted file mode 100644
index c1b0e90..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Arcade
-Icon=arcade_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in b/menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in
deleted file mode 100644
index 18954fa..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Boards
-Icon=boards_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in b/menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in
deleted file mode 100644
index 2ac788f..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Cards
-Icon=cards_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-other.directory.in b/menu/desktop-directories/mandriva-moreapplications-games-other.directory.in
deleted file mode 100644
index 39f3a69..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-games-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=other_amusement
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in b/menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in
deleted file mode 100644
index 8ce0de8..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Puzzles
-Icon=puzzle_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in b/menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in
deleted file mode 100644
index abf35c7..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Sports
-Icon=sport_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in b/menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in
deleted file mode 100644
index e034101..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Strategy
-Icon=strategy_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in b/menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in
deleted file mode 100644
index 6565d42..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Toys
-Icon=toys_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-games.directory.in b/menu/desktop-directories/mandriva-moreapplications-games.directory.in
deleted file mode 100644
index 018fb82..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-games.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Games
-Icon=amusement_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in
deleted file mode 100644
index 7cb1564..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Artificial Intelligence
-Icon=artificial_intelligence_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in
deleted file mode 100644
index a90b846..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Astronomy
-Icon=astronomy_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in
deleted file mode 100644
index 080fe41..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Biology
-Icon=biology_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in
deleted file mode 100644
index 6d26b77..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Chemistry
-Icon=chemistry_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in
deleted file mode 100644
index 3af7cb0..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Computer Science
-Icon=computer_science_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in
deleted file mode 100644
index 34474cc..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Data Visualization
-Icon=data_visualization_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in
deleted file mode 100644
index dfbfd6f..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Electricity
-Icon=electricity_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in
deleted file mode 100644
index 1163474..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Geosciences
-Icon=geosciences_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in
deleted file mode 100644
index 27c465a..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Image Processing
-Icon=image_processing_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in
deleted file mode 100644
index e63c918..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Mathematics
-Icon=mathematics_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in
deleted file mode 100644
index 8fb6220..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Numeric Analysis
-Icon=numerical_analysis_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in
deleted file mode 100644
index 1662a74..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=other_sciences
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in
deleted file mode 100644
index 37e9ff5..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Parallel Computing
-Icon=parallel_computing_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in
deleted file mode 100644
index c1b1df4..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Physics
-Icon=physics_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in
deleted file mode 100644
index 225c8d5..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Robotics
-Icon=robotics_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences.directory.in b/menu/desktop-directories/mandriva-moreapplications-sciences.directory.in
deleted file mode 100644
index c662b55..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-sciences.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Sciences
-Icon=sciences_section
diff --git a/menu/desktop-directories/mandriva-multimedia-graphics.directory.in b/menu/desktop-directories/mandriva-multimedia-graphics.directory.in
deleted file mode 100644
index 5dfcef9..0000000
--- a/menu/desktop-directories/mandriva-multimedia-graphics.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Graphics
-Icon=graphics_section
diff --git a/menu/desktop-directories/mandriva-multimedia-other.directory.in b/menu/desktop-directories/mandriva-multimedia-other.directory.in
deleted file mode 100644
index 010bf91..0000000
--- a/menu/desktop-directories/mandriva-multimedia-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=multimedia_section
diff --git a/menu/desktop-directories/mandriva-multimedia-sound.directory.in b/menu/desktop-directories/mandriva-multimedia-sound.directory.in
deleted file mode 100644
index b0206ed..0000000
--- a/menu/desktop-directories/mandriva-multimedia-sound.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Sound
-Icon=sound_section
diff --git a/menu/desktop-directories/mandriva-multimedia-video.directory.in b/menu/desktop-directories/mandriva-multimedia-video.directory.in
deleted file mode 100644
index 5ba7030..0000000
--- a/menu/desktop-directories/mandriva-multimedia-video.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Video
-Icon=video_section
diff --git a/menu/desktop-directories/mandriva-multimedia.directory.in b/menu/desktop-directories/mandriva-multimedia.directory.in
deleted file mode 100644
index ccaaa00..0000000
--- a/menu/desktop-directories/mandriva-multimedia.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Multimedia
-Icon=multimedia_section
diff --git a/menu/desktop-directories/mandriva-office-accessories.directory.in b/menu/desktop-directories/mandriva-office-accessories.directory.in
deleted file mode 100644
index 4b4b8f8..0000000
--- a/menu/desktop-directories/mandriva-office-accessories.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Accessories
-Icon=office_accessories_section
diff --git a/menu/desktop-directories/mandriva-office-addressbooks.directory.in b/menu/desktop-directories/mandriva-office-addressbooks.directory.in
deleted file mode 100644
index e4efce6..0000000
--- a/menu/desktop-directories/mandriva-office-addressbooks.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Address Books
-Icon=addressbook_section
diff --git a/menu/desktop-directories/mandriva-office-communications-fax.directory.in b/menu/desktop-directories/mandriva-office-communications-fax.directory.in
deleted file mode 100644
index b40260d..0000000
--- a/menu/desktop-directories/mandriva-office-communications-fax.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Fax
-Icon=communications_fax_section
diff --git a/menu/desktop-directories/mandriva-office-communications-other.directory.in b/menu/desktop-directories/mandriva-office-communications-other.directory.in
deleted file mode 100644
index cb4e4af..0000000
--- a/menu/desktop-directories/mandriva-office-communications-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=communications_other_section
diff --git a/menu/desktop-directories/mandriva-office-communications-pda.directory.in b/menu/desktop-directories/mandriva-office-communications-pda.directory.in
deleted file mode 100644
index c513475..0000000
--- a/menu/desktop-directories/mandriva-office-communications-pda.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=PDA
-Icon=pda_section
diff --git a/menu/desktop-directories/mandriva-office-communications-phone.directory.in b/menu/desktop-directories/mandriva-office-communications-phone.directory.in
deleted file mode 100644
index c85e2a6..0000000
--- a/menu/desktop-directories/mandriva-office-communications-phone.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Phone
-Icon=communications_phone_section
diff --git a/menu/desktop-directories/mandriva-office-communications.directory.in b/menu/desktop-directories/mandriva-office-communications.directory.in
deleted file mode 100644
index a52c0ba..0000000
--- a/menu/desktop-directories/mandriva-office-communications.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Communications
-Icon=communications_section
diff --git a/menu/desktop-directories/mandriva-office-drawing.directory.in b/menu/desktop-directories/mandriva-office-drawing.directory.in
deleted file mode 100644
index e5e6736..0000000
--- a/menu/desktop-directories/mandriva-office-drawing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Drawing
-Icon=office_drawing_section
diff --git a/menu/desktop-directories/mandriva-office-graphs.directory.in b/menu/desktop-directories/mandriva-office-graphs.directory.in
deleted file mode 100644
index e0c5d5d..0000000
--- a/menu/desktop-directories/mandriva-office-graphs.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Graphs
-Icon=graphs_section
diff --git a/menu/desktop-directories/mandriva-office-more.directory.in b/menu/desktop-directories/mandriva-office-more.directory.in
new file mode 100644
index 0000000..5fb3eec
--- /dev/null
+++ b/menu/desktop-directories/mandriva-office-more.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=More
+Icon=office_section
diff --git a/menu/desktop-directories/mandriva-office-other.directory.in b/menu/desktop-directories/mandriva-office-other.directory.in
deleted file mode 100644
index db3f56b..0000000
--- a/menu/desktop-directories/mandriva-office-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=office_section
diff --git a/menu/desktop-directories/mandriva-office-presentations.directory.in b/menu/desktop-directories/mandriva-office-presentations.directory.in
deleted file mode 100644
index c3102ef..0000000
--- a/menu/desktop-directories/mandriva-office-presentations.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Presentations
-Icon=presentation_section
diff --git a/menu/desktop-directories/mandriva-office-publishing.directory.in b/menu/desktop-directories/mandriva-office-publishing.directory.in
deleted file mode 100644
index ecab9f6..0000000
--- a/menu/desktop-directories/mandriva-office-publishing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Publishing
-Icon=publishing_section
diff --git a/menu/desktop-directories/mandriva-office-spreadsheets.directory.in b/menu/desktop-directories/mandriva-office-spreadsheets.directory.in
deleted file mode 100644
index b64f8e6..0000000
--- a/menu/desktop-directories/mandriva-office-spreadsheets.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Spreadsheets
-Icon=spreadsheet_section
diff --git a/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in b/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in
deleted file mode 100644
index 3cc120f..0000000
--- a/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Tasks Management
-Icon=taskmanagement_section
diff --git a/menu/desktop-directories/mandriva-office-timemanagement.directory.in b/menu/desktop-directories/mandriva-office-timemanagement.directory.in
deleted file mode 100644
index ad8c6e9..0000000
--- a/menu/desktop-directories/mandriva-office-timemanagement.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Time Management
-Icon=timemanagement_section
diff --git a/menu/desktop-directories/mandriva-office-wordprocessors.directory.in b/menu/desktop-directories/mandriva-office-wordprocessors.directory.in
deleted file mode 100644
index c2e96e2..0000000
--- a/menu/desktop-directories/mandriva-office-wordprocessors.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Wordprocessors
-Icon=wordprocessor_section
diff --git a/menu/desktop-directories/mandriva-sciences-artificialintelligence.directory.in b/menu/desktop-directories/mandriva-sciences-artificialintelligence.directory.in
new file mode 100644
index 0000000..7cb1564
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-artificialintelligence.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Artificial Intelligence
+Icon=artificial_intelligence_section
diff --git a/menu/desktop-directories/mandriva-sciences-astronomy.directory.in b/menu/desktop-directories/mandriva-sciences-astronomy.directory.in
new file mode 100644
index 0000000..a90b846
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-astronomy.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Astronomy
+Icon=astronomy_section
diff --git a/menu/desktop-directories/mandriva-sciences-biology.directory.in b/menu/desktop-directories/mandriva-sciences-biology.directory.in
new file mode 100644
index 0000000..080fe41
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-biology.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Biology
+Icon=biology_section
diff --git a/menu/desktop-directories/mandriva-sciences-chemistry.directory.in b/menu/desktop-directories/mandriva-sciences-chemistry.directory.in
new file mode 100644
index 0000000..6d26b77
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-chemistry.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Chemistry
+Icon=chemistry_section
diff --git a/menu/desktop-directories/mandriva-sciences-computerscience.directory.in b/menu/desktop-directories/mandriva-sciences-computerscience.directory.in
new file mode 100644
index 0000000..3af7cb0
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-computerscience.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Computer Science
+Icon=computer_science_section
diff --git a/menu/desktop-directories/mandriva-sciences-datavisualization.directory.in b/menu/desktop-directories/mandriva-sciences-datavisualization.directory.in
new file mode 100644
index 0000000..34474cc
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-datavisualization.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Data Visualization
+Icon=data_visualization_section
diff --git a/menu/desktop-directories/mandriva-sciences-electricity.directory.in b/menu/desktop-directories/mandriva-sciences-electricity.directory.in
new file mode 100644
index 0000000..dfbfd6f
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-electricity.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Electricity
+Icon=electricity_section
diff --git a/menu/desktop-directories/mandriva-sciences-geosciences.directory.in b/menu/desktop-directories/mandriva-sciences-geosciences.directory.in
new file mode 100644
index 0000000..1163474
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-geosciences.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Geosciences
+Icon=geosciences_section
diff --git a/menu/desktop-directories/mandriva-sciences-imageprocessing.directory.in b/menu/desktop-directories/mandriva-sciences-imageprocessing.directory.in
new file mode 100644
index 0000000..27c465a
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-imageprocessing.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Image Processing
+Icon=image_processing_section
diff --git a/menu/desktop-directories/mandriva-sciences-mathematics.directory.in b/menu/desktop-directories/mandriva-sciences-mathematics.directory.in
new file mode 100644
index 0000000..e63c918
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-mathematics.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Mathematics
+Icon=mathematics_section
diff --git a/menu/desktop-directories/mandriva-sciences-numericanalysis.directory.in b/menu/desktop-directories/mandriva-sciences-numericanalysis.directory.in
new file mode 100644
index 0000000..8fb6220
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-numericanalysis.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Numeric Analysis
+Icon=numerical_analysis_section
diff --git a/menu/desktop-directories/mandriva-sciences-other.directory.in b/menu/desktop-directories/mandriva-sciences-other.directory.in
new file mode 100644
index 0000000..1662a74
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=other_sciences
diff --git a/menu/desktop-directories/mandriva-sciences-parallelcomputing.directory.in b/menu/desktop-directories/mandriva-sciences-parallelcomputing.directory.in
new file mode 100644
index 0000000..37e9ff5
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-parallelcomputing.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Parallel Computing
+Icon=parallel_computing_section
diff --git a/menu/desktop-directories/mandriva-sciences-physics.directory.in b/menu/desktop-directories/mandriva-sciences-physics.directory.in
new file mode 100644
index 0000000..c1b1df4
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-physics.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Physics
+Icon=physics_section
diff --git a/menu/desktop-directories/mandriva-sciences-robotics.directory.in b/menu/desktop-directories/mandriva-sciences-robotics.directory.in
new file mode 100644
index 0000000..225c8d5
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-robotics.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Robotics
+Icon=robotics_section
diff --git a/menu/desktop-directories/mandriva-sciences.directory.in b/menu/desktop-directories/mandriva-sciences.directory.in
new file mode 100644
index 0000000..c662b55
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sciences
+Icon=sciences_section
diff --git a/menu/desktop-directories/mandriva-soundvideo-other.directory.in b/menu/desktop-directories/mandriva-soundvideo-other.directory.in
new file mode 100644
index 0000000..010bf91
--- /dev/null
+++ b/menu/desktop-directories/mandriva-soundvideo-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=multimedia_section
diff --git a/menu/desktop-directories/mandriva-soundvideo.directory.in b/menu/desktop-directories/mandriva-soundvideo.directory.in
new file mode 100644
index 0000000..055b5cc
--- /dev/null
+++ b/menu/desktop-directories/mandriva-soundvideo.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sound & Video
+Icon=multimedia_section
diff --git a/menu/desktop-directories/mandriva-system-archiving-backup.directory.in b/menu/desktop-directories/mandriva-system-archiving-backup.directory.in
deleted file mode 100644
index 4fd55f1..0000000
--- a/menu/desktop-directories/mandriva-system-archiving-backup.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Backup
-Icon=backup_section
diff --git a/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in b/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in
deleted file mode 100644
index 5cae6d0..0000000
--- a/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=CD Burning
-Icon=cd_burning_section
diff --git a/menu/desktop-directories/mandriva-system-archiving-compression.directory.in b/menu/desktop-directories/mandriva-system-archiving-compression.directory.in
deleted file mode 100644
index ef08446..0000000
--- a/menu/desktop-directories/mandriva-system-archiving-compression.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Compression
-Icon=compression_section
diff --git a/menu/desktop-directories/mandriva-system-archiving-other.directory.in b/menu/desktop-directories/mandriva-system-archiving-other.directory.in
deleted file mode 100644
index 1a0f328..0000000
--- a/menu/desktop-directories/mandriva-system-archiving-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=other_archiving
diff --git a/menu/desktop-directories/mandriva-system-archiving.directory.in b/menu/desktop-directories/mandriva-system-archiving.directory.in
deleted file mode 100644
index 20e5d95..0000000
--- a/menu/desktop-directories/mandriva-system-archiving.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Archiving
-Icon=archiving_section
diff --git a/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in b/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in
deleted file mode 100644
index d818d52..0000000
--- a/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Boot and Init
-Icon=boot_init_section
diff --git a/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in b/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in
deleted file mode 100644
index 86cb531..0000000
--- a/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Hardware
-Icon=hardware_configuration_section
diff --git a/menu/desktop-directories/mandriva-system-configuration-networking.directory.in b/menu/desktop-directories/mandriva-system-configuration-networking.directory.in
deleted file mode 100644
index 72ec939..0000000
--- a/menu/desktop-directories/mandriva-system-configuration-networking.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Networking
-Icon=networking_configuration_section
diff --git a/menu/desktop-directories/mandriva-system-configuration-other.directory.in b/menu/desktop-directories/mandriva-system-configuration-other.directory.in
deleted file mode 100644
index 51b50ad..0000000
--- a/menu/desktop-directories/mandriva-system-configuration-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=other_configuration
diff --git a/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in b/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in
deleted file mode 100644
index 37c3ceb..0000000
--- a/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Packaging
-Icon=packaging_section
diff --git a/menu/desktop-directories/mandriva-system-configuration-printing.directory.in b/menu/desktop-directories/mandriva-system-configuration-printing.directory.in
deleted file mode 100644
index d9988df..0000000
--- a/menu/desktop-directories/mandriva-system-configuration-printing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Printing
-Icon=printing_section
diff --git a/menu/desktop-directories/mandriva-system-configuration.directory.in b/menu/desktop-directories/mandriva-system-configuration.directory.in
deleted file mode 100644
index a3b404b..0000000
--- a/menu/desktop-directories/mandriva-system-configuration.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Configuration
-Icon=configuration_section
diff --git a/menu/desktop-directories/mandriva-system-filetools.directory.in b/menu/desktop-directories/mandriva-system-filetools.directory.in
deleted file mode 100644
index 4306fb7..0000000
--- a/menu/desktop-directories/mandriva-system-filetools.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=File Tools
-Icon=file_tools_section
diff --git a/menu/desktop-directories/mandriva-system-monitoring.directory.in b/menu/desktop-directories/mandriva-system-monitoring.directory.in
deleted file mode 100644
index df68be5..0000000
--- a/menu/desktop-directories/mandriva-system-monitoring.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Monitoring
-Icon=monitoring_section
diff --git a/menu/desktop-directories/mandriva-system-terminals.directory.in b/menu/desktop-directories/mandriva-system-terminals.directory.in
deleted file mode 100644
index ed56f96..0000000
--- a/menu/desktop-directories/mandriva-system-terminals.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Terminals
-Icon=terminals_section
diff --git a/menu/desktop-directories/mandriva-system-texttools.directory.in b/menu/desktop-directories/mandriva-system-texttools.directory.in
deleted file mode 100644
index da94ea2..0000000
--- a/menu/desktop-directories/mandriva-system-texttools.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Text Tools
-Icon=text_tools_section
diff --git a/menu/desktop-directories/mandriva-system.directory.in b/menu/desktop-directories/mandriva-system.directory.in
deleted file mode 100644
index b84cb66..0000000
--- a/menu/desktop-directories/mandriva-system.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=System
-Icon=system_section
diff --git a/menu/desktop-directories/mandriva-systemtools.directory.in b/menu/desktop-directories/mandriva-systemtools.directory.in
new file mode 100644
index 0000000..8894e31
--- /dev/null
+++ b/menu/desktop-directories/mandriva-systemtools.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=System Tools
+Icon=configuration_section
diff --git a/menu/desktop-directories/mandriva-tools-other.directory.in b/menu/desktop-directories/mandriva-tools-other.directory.in
new file mode 100644
index 0000000..bf6f545
--- /dev/null
+++ b/menu/desktop-directories/mandriva-tools-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=system_section
diff --git a/menu/desktop-directories/mandriva-tools.directory.in b/menu/desktop-directories/mandriva-tools.directory.in
new file mode 100644
index 0000000..99112c6
--- /dev/null
+++ b/menu/desktop-directories/mandriva-tools.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Tools
+Icon=system_section
diff --git a/menu/mandrake_desk-9.2 b/menu/mandrake_desk-9.2
deleted file mode 100644
index 848924c..0000000
--- a/menu/mandrake_desk-9.2
+++ /dev/null
@@ -1,200 +0,0 @@
-##
-# Locate a file
-?package(kdebase-progs): 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"
-
-# File manager
-?package(kdebase-progs): needs="kde" kde_filename="Home" section="/" title="Manage your files" icon="home-mdk.png" command="kfmclient openProfile filemanagement" kde_opt="\\nTerminal=0"
-
-
-
-
-
-
-## Administer your system
-# Burn a CD 
-?package(k3b): needs="x11" kde_filename="k3b" section="Administer your system" title="Burn a CD" icon="k3b.png" command="k3b" mimetypes="application/x-k3b" kde_opt="\\nDocPath=k3b/index.html\\nTerminal=0\\nX-KDE-NativeMimeType=application/x-k3b\\nCategories=Qt;KDE;AudioVideo"
-
-# Configure sound settings
-?package(kdemultimedia-kmix): 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="\\nEncoding=UTF-8\\nDocPath=kmix/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nGenericName=Sound Mixer\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nCategories=Qt;KDE;AudioVideo"
-
-# Configure KDE
-?package(kdebase-progs): needs="kde" kde_filename="KControl" section="Administer your system" title="Configure your desktop" icon="kcontrol.png" command="kcontrol" kde_command="kcontrol -caption \"%c\" %i %m" kde_opt="\\nDocPath=kcontrol/index.html\\nX-KDE-StartupNotify=true"
-
-
-# Mandrake Control Center
-?package(drakconf): needs="x11" icon="drakconf.png" section="Administer your system" title="Configure your computer" command="/usr/sbin/drakconf"
-
-
-# Format a floppy
-?package(kdeutils-kfloppy): 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-kdepasswd): 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"
-
-# Use a terminal emulator 
-?package(kdebase-konsole): needs="kde" kde_filename="konsole" section="Administer your system" title="Use a terminal emulator" icon="konsole.png" command="konsole" kde_opt="\\nEncoding=UTF-8\\nDocPath=konsole/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nGenericName=Terminal Program\\nX-DCOP-ServiceType=Multi\\nX-KDE-AuthorizeAction=shell_access"
-
-
-
-
-
-
-
-
-## Enjoy music & video
-# Listen to a musical CD
-?package(kdemultimedia-kscd): needs="kde" kde_filename="kscd" section="Enjoy music & video" 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"
-
-# Listen to music files
-?package(totem): needs="x11" command="/usr/bin/totem %U" section="Enjoy music & video" title="Listen to music files" icon="totem.png" mimetypes="video/mpeg,video/msvideo,video/quicktime,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-ogg,audio/x-mp3,audio/x-mpeg,video/x-fli,audio/x-wav,audio/x-mpegurl" kde_opt="InitialPreference=15"
-
-# Record sounds 
-?package(gnome-media): needs="x11" command="/usr/bin/gnome-sound-recorder" section="Enjoy music & video" title="Record sounds" icon="/usr/share/pixmaps/gnome-grecord.png" startup_notify="true"
-
-# Rip cd
-?package(kdemultimedia-kaudiocreator):command="kaudiocreator" icon="kaudiocreator.png" title="Rip a CD" needs="x11" section="Enjoy music & video"
-
-# Watch TV
-?package(xawtv): command="XawTV" icon="xawtv.png" section="Enjoy music & video" title="Watch TV" needs="x11"
-
-# Watch videos
-?package(totem): needs="x11" command="/usr/bin/totem %U" section="Enjoy music & video" title="Watch videos" icon="totem.png" mimetypes="video/mpeg,video/msvideo,video/quicktime,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-ogg,audio/x-mp3,audio/x-mpeg,video/x-fli,audio/x-wav,audio/x-mpegurl" kde_opt="InitialPreference=15"
-
-
-
-
-
-
-
-## Play games
-# Armagetron
-?package(armagetron):command="/usr/games/armagetron" icon="armagetron.png" needs="x11" section="Play games" title="Play ArmageTron"
-
-# Chromium
-?package(chromium):command="/usr/games/chromium" icon="chromium.png" needs="x11" section="Play games" title="Play Chromium"
-
-# Canon Smash
-?package(csmash):command="/usr/bin/csmash" icon="csmash.png" needs="x11" section="Play games" title="Play Cannon Smash"
-
-# Frozen-Bubble
-?package(frozen-bubble):command="/usr/games/frozen-bubble" icon="frozen-bubble.png" needs="X11" section="Play games" title="Play Frozen-Bubble"
-
-# LBreakout
-?package(lbreakout2):needs="x11" section="Play games" title="Play LBreakout" command="/usr/games/lbreakout2" icon="lbreakout2.png"
-
-# TuXRacer
-?package(tuxracer):command="soundwrapper /usr/games/tuxracer" icon="tuxracer.png" needs="x11" section="Play games" title="Play Tuxracer"
-
-
-
-
-
-
-## Read documentation
-# Read Mandrake documentation
-?package(mandrake_doc-de): command="sh -c '$BROWSER /usr/share/doc/mandrake/de/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in german" section="Read documentation"
-
-?package(mandrake_doc-en): command="sh -c '$BROWSER /usr/share/doc/mandrake/en/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in english" section="Read documentation"
-
-?package(mandrake_doc-es): command="sh -c '$BROWSER /usr/share/doc/mandrake/es/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in spanish" section="Read documentation"
-
-?package(mandrake_doc-fr): command="sh -c '$BROWSER /usr/share/doc/mandrake/fr/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in french" section="Read documentation"
-
-?package(mandrake_doc-it): command="sh -c '$BROWSER /usr/share/doc/mandrake/it/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in italian" section="Read documentation"
-
-# Read KDE documentation
-?package(kdebase-progs): needs="kde" kde_filename="Help" section="Read documentation" title="Read KDE documentation" icon="khelpcenter.png" command="khelpcenter" kde_opt="\\nDocPath=khelpcenter/index.html\\nTerminal=0"
-
-
-
-
-
-
-## Use office tools
-# Create a presentation
-?package(OpenOffice.org): needs="x11" section="Use office tools" icon="ooo_impress.png" title="Create a presentation" command="ooimpress" mimetypes="application/vnd.sun.xml.impress;application/vnd.stardivision.impress;application/mspowerpoint"
-
-# Create a text document
-?package(OpenOffice.org): needs="x11" section="Use office tools" icon="ooo_writer.png" title="Create a text document" command="oowriter" mimetypes="application/vnd.sun.xml.writer,application/vnd.stardivision.writer,application/msword,application/vnd.ms-word,application/x-doc,text/rtf"
-
-# Create a spreadsheet
-?package(OpenOffice.org): needs="x11" section="Use office tools" icon="ooo_calc.png" title="Create a spreadsheet" command="oocalc" mimetypes="application/vnd.sun.xml.calc,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/msexcel,application/vnd.ms-excel"
-
-# Diagrams
-?package(dia): needs="x11" section="Use office tools" title="Create flowcharts and diagrams" command="/usr/bin/dia" icon="dia.png"
-
-# Manage your contacts
-?package(kdepim-kaddressbook): needs="x11" kde_filename="kaddressbook" section="Use office tools" title="Manage your contacts" icon="kaddressbook.png" command="kaddressbook" mimetypes="text/x-vcard" kde_opt="\\nEncoding=UTF-8\\nDocPath=kaddressbook/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nServiceTypes=KParts/ReadOnlyPart;Browser/View\\nX-KDE-Library=libkaddressbookpart"
-
-# Manage your finances
-?package(gnucash): command="/usr/bin/gnucash" icon="gnucash.png" needs="x11" section="Use office tools" title="Manage your finances"
-
-# Manage your projects
-?package(mrproject):command="mrproject" needs="x11" section="Use office tools" title="Manage your projects" icon="taskmanagement_section.png" startup_notify="true"
-
-# Manage your time
-?package(kdepim-korganizer): needs="x11" kde_filename="korganizer" section="Use office tools" title="Manage your time" icon="korganizer.png" command="korganizer" mimetypes="text/calendar,text/x-vcalendar" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=korganizer;\\nTerminalOptions=\\nPath=\\nDocPath=korganizer/index.html\\nTerminal=0\\nServiceTypes=Browser/View\\nX-KDE-Library=libkorganizer\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique"
-
-# Send a fax
-?package(kdebase-kdeprintfax): 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"
-
-# Write and stick notes
-?package(kdepim-knotes): needs="kde" kde_filename="knotes" section="Use office tools" title="Write and stick notes" icon="knotes.png" command="knotes" kde_opt="\\nEncoding=UTF-8\\nDocPath=knotes/index.html\\nTerminal=0\\nGenericName=Popup Notes\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique"
-
-# Set up reminder messages
-?package(kdepim-korganizer): needs="x11" kde_filename="kalarm" section="Use office tools" title="Set up reminder messages" icon="kalarm.png" command="kalarm" kde_command="kalarm -caption \"%c\" %i" kde_opt="\\nEncoding=UTF-8\\nDocPath=kalarm/index.html\\nGenericName=Reminder Message Scheduler\\nTerminal=0\\nX-DCOP-ServiceType=Unique\\nX-KDE-StartupNotify=true"
-
-# View fax
-?package(kdegraphics-kfax): needs="x11" kde_filename="kfax" section="Use office tools" title="View fax" icon="kfax.png" command="kfax" kde_command="kfax %f   -caption \"%c\" %i %m" mimetypes="image/fax-g3" multiple_files="false" accept_url="false" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=kfax;\\nGenericName=Fax Viewer\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi"
-
-
-
-
-
-## Use the Internet
-# Access Newsgroups
-?package(kdenetwork-knode): 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"
-
-# Browse the Web
-?package(kdebase-progs): needs="x11" kde_filename="konqbrowser" section="Use the Internet" title="Browse the Web" icon="konqueror.png" command="konqueror --profile webbrowsing" kde_opt="\\nEncoding=UTF-8\\nDocPath=konqueror/index.html"
-
-# Chat using AIM, ICQ, MSN, Yahoo, Winpopup
-?package(gaim): needs="x11" command="gaim" icon="gaim.png" title="Chat using AIM, ICQ, MSN, Yahoo, Winpopup" section="Use the Internet"
-
-# Chat using IRC
-?package(xchat):needs="x11" section="Use the Internet" title="Chat using IRC" command="xchat" icon="xchat.png"
-
-# Connect to the Internet
-?package(kdenetwork-kppp): 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"
-
-# Create Web pages
-?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=""
-
-# Dialog using video conference
-?package(gnomemeeting): command="/usr/bin/gnomemeeting" needs="x11" icon="gnomemeeting.png" section="Use the Internet" title="Dialog using video conference"
-
-# Read and send mail
-?package(kdenetwork-kmail): 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"
-
-# Transfer files using FTP
-?package(kbear): needs="kde" kde_filename="kbear" section="Use the Internet" title="Transfer files using FTP" icon="kbear.png" command="kbear" kde_opt="\\nEncoding=UTF-8\\nGenericName=FTP Client\\nMiniIcon=kbear\\nDocPath=kbear/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique"
-
-
-
-
-
-
-## View, modify or create a picture
-# Manage, show and print your photos
-?package(flphoto):command="/usr/bin/flphoto" title="Manage, show and print your photos" needs="x11" section="View, modify, or create graphics" icon="graphics_section.png"
-
-# Manipulate pictures
-?package(gimp): command="gimp" icon="wilbur.png" section="View, modify, or create graphics" 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;"
-
-# Scan and use an OCR
-?package(kdegraphics-kooka): needs="kde" kde_filename="kooka" section="View, modify, or create graphics" title="Scan and use an OCR" 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"
-
-# Take a screenshot
-?package(kdegraphics-ksnapshot): needs="kde" kde_filename="ksnapshot" section="View, modify, or create graphics" 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"
-
diff --git a/menu/mandriva-discovery.menu b/menu/mandriva-discovery.menu
deleted file mode 100644
index f2f0e58..0000000
--- a/menu/mandriva-discovery.menu
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-<Menu>
-  <Name>Mandriva Linux</Name>
-  <Menu>
-    <Name>Graphics</Name>
-    <Exclude>
-      <Filename>kde-kpdf.desktop</Filename>
-      <Filename>kde-kghostview.desktop</Filename>
-    </Exclude>
-  </Menu>
-  <Menu>
-    <Name>Internet</Name>
-    <Layout>
-      <Filename>mandriva-mozilla-firefox.desktop</Filename>
-      <Filename>kde-konqbrowser.desktop</Filename>
-      <Filename>epiphany.desktop</Filename>
-      <Filename>evolution.desktop</Filename>
-      <Filename>kde-KMail.desktop</Filename>
-      <Filename>kde-Kontact.desktop</Filename>
-      <Filename>kde-kopete.desktop</Filename>
-      <Filename>gaim.desktop</Filename>
-      <Merge type="menus"/>
-      <Merge type="files"/>
-    </Layout>
-    <Exclude>
-      <Filename>kde-kppplogview.desktop</Filename>
-      <Filename>kde-Kppp.desktop</Filename>
-      <Filename>kde-ksig.desktop</Filename>
-      <Filename>kde-knewsticker-standalone.desktop</Filename>
-      <Filename>kde-krfb.desktop</Filename>
-      <Filename>kde-krdc.desktop</Filename>
-      <Filename>kde-kget.desktop</Filename>
-      <Filename>kde-KNode.desktop</Filename>
-      <Filename>kde-ksirc.desktop</Filename>
-      <Filename>kde-groupwarewizard.desktop</Filename>
-      <Filename>kde-kbluetoothd.desktop</Filename>
-      <Filename>kde-kbtobexclient.desktop</Filename>
-      <Filename>kde-kbtserialchat.desktop</Filename>
-      <Filename>kde-knetattach.desktop</Filename>
-      <Filename>kde-kdict.desktop</Filename>
-      <Filename>bme.desktop</Filename>
-      <Filename>gftp.desktop</Filename>
-    </Exclude>
-  </Menu>
-  <Menu>
-    <Name>Office</Name>
-    <Layout>
-      <Filename>template2.1.desktop</Filename>
-      <Filename>writer2.1.desktop</Filename>
-      <Filename>calc2.1.desktop</Filename>
-      <Filename>impress2.1.desktop</Filename>
-      <Filename>draw2.1.desktop</Filename>
-      <Filename>base2.1.desktop</Filename>
-      <Filename>web2.1.desktop</Filename>
-      <Separator/>
-      <Filename>kde-kwrite.desktop</Filename>
-      <Filename>kde-kpdf.desktop</Filename>
-      <Filename>kde-korganizer.desktop</Filename>
-      <Filename>kde-kalarm.desktop</Filename>
-      <Filename>kde-kcalc.desktop</Filename>
-      <Merge type="menus"/>
-      <Merge type="files"/>
-    </Layout>
-    <Exclude>
-      <Filename>kde-kghostview.desktop</Filename>
-      <Filename>kde-kate.desktop</Filename>
-      <Filename>kde-kaddressbook.desktop</Filename>
-      <Filename>kde-kdict.desktop</Filename>
-      <Filename>kde-KCharSelect.desktop</Filename>
-      <Filename>kde-multisynk.desktop</Filename>
-      <Filename>mandriva-hp-sendfax.desktop</Filename>
-      <Filename>kde-kpalmdoc.desktop</Filename>
-      <Filename>kde-Kontact.desktop</Filename>
-      <Filename>kde-karm.desktop</Filename>
-      <Filename>kde-knotes.desktop</Filename>
-      <Filename>gnome-dictionary.desktop</Filename>
-    </Exclude>
-  </Menu>
-  <Menu>
-    <Name>Multimedia</Name>
-    <Exclude>
-      <Filename>mandriva-echomixer.desktop</Filename>
-      <Filename>mandriva-envy24control.desktop</Filename>
-      <Filename>mandriva-rmedigicontrol.desktop</Filename>
-      <Filename>kde-kdenlive.desktop</Filename>
-      <Filename>vumeter.desktop</Filename>
-      <Filename>reclevel.desktop</Filename>
-      <Filename>kde-k3b.desktop</Filename>
-      <Filename>gnome-cd.desktop</Filename>
-    </Exclude>
-  </Menu>
-  <Menu>
-    <Name>System</Name>
-    <Layout>
-      <Filename>mandriva-drakconf.desktop</Filename>
-      <Filename>mandriva-rpmdrake-root.desktop</Filename>
-      <Filename>kde-KControl.desktop</Filename>
-      <Filename>kde-kmenuedit.desktop</Filename>
-      <Filename>alacarte.desktop</Filename>
-      <Filename>mandriva-drakmenustyle.desktop</Filename>
-      <Filename>mandriva-ftw.desktop</Filename>
-      <Filename>mandriva-mdvonline.desktop</Filename>
-      <Filename>mandriva-mdvonline-bundle.desktop</Filename>
-      <Separator/>
-      <Merge type="menus"/>
-      <Merge type="files"/>
-    </Layout>
-    <Exclude>
-      <Filename>mandriva-mtink.desktop</Filename>
-      <Filename>kde-ksig.desktop</Filename>
-      <Filename>kde-kdf.desktop</Filename>
-      <Filename>kde-kwifimanager.desktop</Filename>
-      <Filename>kde-kinfocenter.desktop</Filename>
-      <Filename>kde-kover.desktop</Filename>
-      <Filename>kde-kwalletconfig.desktop</Filename>
-      <Filename>kde-kcm_kbluetoothd.desktop</Filename>
-      <Filename>mandriva-xterm.desktop</Filename>
-      <Filename>kde-KFloppy.desktop</Filename>
-      <Filename>kde-kcm_btpaired.desktop</Filename>
-      <Filename>mandriva-userdrake.desktop</Filename>
-      <Filename>mandriva-hp-toolbox.desktop</Filename>
-      <Filename>kde-ksysguard.desktop</Filename>
-      <Filename>mandriva-harddrake-ui.desktop</Filename>
-      <Filename>mandriva-rpmdrake.desktop</Filename>
-      <Filename>mandriva-drakxtools-newt-system.desktop</Filename>
-      <Filename>mandriva-drakxtools-newt-user.desktop</Filename>
-      <Filename>kde-krandrtray.desktop</Filename>
-      <Filename>kde-kwikdisk.desktop</Filename>
-      <Filename>kde-kpowersave.desktop</Filename>
-      <Filename>kde-KCharSelect.desktop</Filename>
-      <Filename>kde-klipper.desktop</Filename>
-      <Filename>kde-kappfinder.desktop</Filename>
-      <Filename>kde-kpager.desktop</Filename>
-      <Filename>kde-kcmkicker.desktop</Filename>
-      <Filename>kde-krfb.desktop</Filename>
-      <Filename>kde-kpersonalizer.desktop</Filename>
-      <Filename>kde-kdeprintfax.desktop</Filename>
-      <Filename>kde-kfontview.desktop</Filename>
-      <Filename>kde-groupwarewizard.desktop</Filename>
-      <Filename>kde-kalarm.desktop</Filename>
-      <Filename>kde-karm.desktop</Filename>
-      <Filename>kde-knotes.desktop</Filename>
-      <Filename>kde-printers.desktop</Filename>
-      <Filename>kde-kcalc.desktop</Filename>
-      <Filename>kde-multisynk.desktop</Filename>
-      <Filename>kde-ktip.desktop</Filename>
-      <Filename>kde-kwalletmanager.desktop</Filename>
-      <Filename>drakbackup.desktop</Filename>
-      <Filename>mandriva-drakxtools-curses-system.desktop</Filename>
-      <Filename>mandriva-drakxtools-curses-user.desktop</Filename>
-      <Filename>mandriva-printerdrake.desktop</Filename>
-      <Filename>net_applet.desktop</Filename>
-      <Filename>baobab.desktop</Filename>
-      <Filename>nautilus.desktop</Filename>
-      <Filename>gdmsetup.desktop</Filename>
-      <Filename>gcalctool.desktop</Filename>
-      <Filename>gdmphotosetup.desktop</Filename>
-      <Filename>gdmflexiserver.desktop</Filename>
-      <Filename>gnome-system-log.desktop</Filename>
-      <Filename>gnome-search-tool.desktop</Filename>
-      <Filename>gnome-volume-control.desktop</Filename>
-      <Filename>gfloppy.desktop</Filename>
-      <Filename>gnome-system-monitor.desktop</Filename>
-      <Filename>gnome-obex-server.desktop</Filename>
-      <Filename>gnome-dictionary.desktop</Filename>
-      <Filename>gnome-power-preferences.desktop</Filename>
-      <Filename>gnome-power-statistics.desktop</Filename>
-      <Filename>gnome-screensaver-preferences.desktop</Filename>
-      <Filename>session-properties.desktop</Filename>
-      <Filename>gnome-screenshot.desktop</Filename>
-      <Filename>gedit.desktop</Filename>
-      <Filename>alacarte.desktop</Filename>
-      <Filename>kasumi.desktop</Filename>
-      <Filename>uim.desktop</Filename>
-      <Filename>scim-setup.desktop</Filename>
-      <Filename>cups.desktop</Filename>
-    </Exclude>
-  </Menu>
-  <Menu>
-    <Name>More Applications</Name>
-    <Exclude>
-      <Filename>kde-kbtobexclient.desktop</Filename>
-      <Filename>kde-kbluetoothd.desktop</Filename>
-      <Filename>kde-kbtserialchat.desktop</Filename>
-      <Filename>kde-kjscmd.desktop</Filename>
-      <Filename>kde-embedjs.desktop</Filename>
-      <Filename>invest-chart.desktop</Filename>
-      <Filename>base2.1.desktop</Filename>
-      <Filename>kasumi.desktop</Filename>
-      <Filename>gnome-obex-server.desktop</Filename>
-    </Exclude>
-  </Menu>
-</Menu>
diff --git a/menu/menu b/menu/menu
deleted file mode 100644
index fb69b89..0000000
--- a/menu/menu
+++ /dev/null
@@ -1,128 +0,0 @@
-?package(menu): needs=x11 section="/" title="Office" icon="office_section.png" order="Wordprocessors,Spreadsheets,Presentations,Drawing,Graphs,Publishing,Tasks Management,Time Management,Address Books,Communications,Accessories,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Accessories" icon="office_accessories_section.png" order="_mergemenu_,kcalc,oooqs,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Address Books" icon="addressbook_section.png" order="_mergemenu_,kaddressbook,_mergefile_"
-#
-?package(menu): needs=x11 section="Office" title="Communications" icon="communications_section.png" order="Fax,Phone,PDA,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Office/Communications" title="Fax" icon="communications_fax_section.png"
-?package(menu): needs=x11 section="Office/Communications" title="PDA" icon="pda_section.png" order="_mergemenu_,kpilot,_mergefile_"
-?package(menu): needs=x11 section="Office/Communications" title="Phone" icon="communications_phone_section.png"
-?package(menu): needs=x11 section="Office/Communications" title="Other" icon="communications_other_section.png"
-#
-?package(menu): needs=x11 section="Office" title="Drawing" icon="office_drawing_section.png" order="_mergemenu_,OpenOffice.org Draw,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Graphs" icon="graphs_section.png" order="_mergemenu_,Dia,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Presentations" icon="presentation_section.png" order="_mergemenu_,OpenOffice.org Impress,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Publishing" icon="publishing_section.png" order="_mergemenu_,Xpdf,GhostView,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Spreadsheets" icon="spreadsheet_section.png" order="_mergemenu_,OpenOffice.org Calc,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Tasks Management" icon="taskmanagement_section.png" order="_mergemenu_,Planner,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Time Management" icon="timemanagement_section.png" order="_mergemenu_,korganizer,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Wordprocessors" icon="wordprocessor_section.png" order="_mergemenu_,OpenOffice.org Writer,OpenOffice.org Math,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Other" icon="office_section.png"
-#
-#
-?package(menu): needs=x11 section="/" title="Internet" icon="internet_section.png" order="Web Browsers,Mail,Instant Messaging,Chat,News,File Transfer,Video Conference,Web Editors,Remote Access,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Chat" icon="chat_section.png" order="_mergemenu_,ksirc,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="File Transfer" icon="file_transfer_section.png" order="_mergemenu_,kbear,Gtm,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Instant Messaging" icon="instant_messaging_section.png" order="_mergemenu_,kopete,Gaim,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Mail" icon="mail_section.png" order="_mergemenu_,Kontact,Evolution,Mozilla Thunderbird,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="News" icon="news_section.png" order="_mergemenu_,KNode,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Remote Access" icon="remote_access_section.png" order="_mergemenu_,Kppp,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Video Conference" icon="video_conferences_section.png"
-?package(menu): needs=x11 section="Internet" title="Web Browsers" icon="web_browser_section.png" order="_mergemenu_,konqbrowser,Mozilla,Mozilla Firefox,Epiphany Web Browser,Epiphany Bookmarks Editor,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Web Editors" icon="web_editors_section.png"
-?package(menu): needs=x11 section="Internet" title="Other" icon="other_networking.png"
-#
-#
-?package(menu): needs=x11 section="/" title="Multimedia" icon="multimedia_section.png" order="Sound,Video,Graphics,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Multimedia" title="Graphics" icon="graphics_section.png" order="_mergemenu_,The GIMP,kooka,_mergefile_"
-?package(menu): needs=x11 section="Multimedia" title="Sound" icon="sound_section.png" order="_mergemenu_,kscd,Totem Media Player,_mergefile_"
-?package(menu): needs=x11 section="Multimedia" title="Video" icon="video_section.png" order="_mergemenu_,Totem Movie Player,_mergefile_"
-?package(menu): needs=x11 section="Multimedia" title="Other" icon="multimedia_section.png"
-#
-#
-?package(menu): needs=x11 section="/" title="System" icon="system_section.png" order="Terminals,Text Tools,Configuration,Archiving,File Tools,Monitoring,Session,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="System" title="Archiving" icon="archiving_section.png" order="Backup,CD Burning,Compression,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="System/Archiving" title="Backup" icon="backup_section.png" order="_mergemenu_,DrakSync,_mergefile_"
-?package(menu): needs=x11 section="System/Archiving" title="CD Burning" icon="cd_burning_section.png" order="_mergemenu_,k3b,_mergefile_"
-?package(menu): needs=x11 section="System/Archiving" title="Compression" icon="compression_section.png"
-?package(menu): needs=x11 section="System/Archiving" title="Other" icon="other_archiving.png"
-#
-?package(menu): needs=x11 section="System" title="Configuration" icon="configuration_section.png" order="KControl,Configure Your Computer,Boot and Init,GNOME,Hardware,Networking,Packaging,Printing,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="System/Configuration" title="Boot and Init" icon="boot_init_section.png"
-?package(menu): needs=x11 section="System/Configuration" title="GNOME" icon="gnome_section.png"
-?package(menu): needs=x11 section="System/Configuration" title="Hardware" icon="hardware_configuration_section.png"
-?package(menu): needs=kde section="System/Configuration" title="KDE" icon="kde_section.png" kde_opt="X-KDE-BaseGroup=settings" 
-?package(menu): needs=x11 section="System/Configuration" title="Networking" icon="networking_configuration_section.png"
-?package(menu): needs=x11 section="System/Configuration" title="Packaging" icon="packaging_section.png"
-?package(menu): needs=x11 section="System/Configuration" title="Printing" icon="printing_section.png"
-?package(menu): needs=x11 section="System/Configuration" title="Users" icon="configuration_section.png"
-?package(menu): needs=x11 section="System/Configuration" title="Other" icon="other_configuration.png"
-#
-?package(menu): needs=x11 section="System" title="File Tools" icon="file_tools_section.png" order="_mergemenu_,Kfind,_mergefile_"
-?package(menu): needs=x11 section="System" title="Monitoring" icon="monitoring_section.png" order="_mergemenu_,ksysguard,_mergefile_"
-?package(menu): needs=x11 section="System" title="Terminals" icon="terminals_section.png" order="_mergemenu_,konsole,_mergefile_"
-?package(menu): needs=x11 section="System" title="Text Tools" icon="text_tools_section.png" order="_mergemenu_,kdict,_mergefile_"
-?package(menu): needs=x11 section="System" title="Other" icon="system_other_section.png"
-#
-#
-?package(menu): needs=x11 section="/" title="More Applications" icon="more_applications_section.png" order="Accessibility,Development,Editors,Emulators,Finances,Databases,Education,Sciences,Communications,Games,Documentation,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="More Applications" title="Accessibility" icon="accessibility_section.png" order="_mergemenu_,kmag,_mergefile_"
-?package(menu): needs=x11 section="More Applications" title="Communications" icon="communications_section.png"
-?package(menu): needs=x11 section="More Applications" title="Databases" icon="databases_section.png"
-#
-?package(menu): needs=x11 section="More Applications" title="Development" icon="development_section.png" order="Development Environment,Interpreters,Tools,Code Generators,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Development" title="Code Generators" icon="code_generator_section.png"
-?package(menu): needs=x11 section="More Applications/Development" title="Development Environments" icon="development_environment_section.png" order="_mergemenu_,kdevelop,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Development" title="Interpreters" icon="interpreters_section.png" order="_mergemenu_,GNU Prolog,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Development" title="Tools" icon="development_tools_section.png" order="_mergemenu_,Gdb,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Development" title="Other" icon="development_section.png"
-#
-?package(menu): needs=x11 section="More Applications" title="Documentation" icon="documentation_section.png"
-?package(menu): needs=x11 section="More Applications" title="Editors" icon="editors_section.png" order="_mergemenu_,Emacs,XEmacs,VI editor,_mergefile_"
-#
-?package(menu): needs=x11 section="More Applications" title="Education" icon="education_section.png" order="Economy,Geography,History,Languages,Literature,Sciences,Sports,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Education" title="Economy" icon="education_economy_section.png"
-?package(menu): needs=x11 section="More Applications/Education" title="Geography" icon="education_geography_section.png"
-?package(menu): needs=x11 section="More Applications/Education" title="History" icon="education_history_section.png"
-?package(menu): needs=x11 section="More Applications/Education" title="Languages" icon="education_languages_section.png"
-?package(menu): needs=x11 section="More Applications/Education" title="Literature" icon="education_literature_section.png"
-?package(menu): needs=x11 section="More Applications/Education" title="Sciences" icon="education_sciences.png"
-?package(menu): needs=x11 section="More Applications/Education" title="Sports" icon="education_sport_section.png"
-?package(menu): needs=x11 section="More Applications/Education" title="Other" icon="education_other_section.png"
-#
-?package(menu): needs=x11 section="More Applications" title="Emulators" icon="emulators_section.png"
-?package(menu): needs=x11 section="More Applications" title="Finances" icon="finances_section.png" order="_mergemenu_,GnuCash,kmymoney2,_mergefile_"
-#
-?package(menu): needs=x11 section="More Applications" title="Games" icon="amusement_section.png" order="Adventure,Arcade,Boards,Cards,Puzzles,Sports,Strategy,Toys,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Games" title="Adventure" icon="adventure_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Arcade" icon="arcade_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Boards" icon="boards_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Cards" icon="cards_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Puzzles" icon="puzzle_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Sports" icon="sport_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Strategy" icon="strategy_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Toys" icon="toys_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Other" icon="other_amusement.png"
-#
-?package(menu): needs=x11 section="More Applications" title="Sciences" icon="sciences_section.png" order="Artificial Intelligence,Astronomy,Biology,Chemistry,Computer Science,Data Visualization,Electricity,Geosciences,Image Processing,Mathematics,Numeric analysis,Parallel Computing,Physics,Robotics,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Artificial Intelligence" icon="artificial_intelligence_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Astronomy" icon="astronomy_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Biology" icon="biology_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Chemistry" icon="chemistry_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Computer science" icon="computer_science_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Data Visualization" icon="data_visualization_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Electricity" icon="electricity_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Geosciences" icon="geosciences_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Image Processing" icon="image_processing_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Mathematics" icon="mathematics_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Numeric Analysis" icon="numerical_analysis_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Parallel Computing" icon="parallel_computing_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Physics" icon="physics_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Robotics" icon="robotics_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Other" icon="other_sciences.png"
-#
-?package(menu): needs=x11 section="More Applications" title="Other" icon="more_applications_other_section.png"
-
-
-# Needs to be owned by wm else we have empty entry in some Desktop
-?package(menu): needs=wm section="/" title="Session" icon="windowmanager_section.png"
-?package(menu): needs=wm section="Session" title="Windowmanagers" icon="windowmanager_section.png"
diff --git a/menu/menu-simplified b/menu/menu-simplified
deleted file mode 100644
index 17f74a5..0000000
--- a/menu/menu-simplified
+++ /dev/null
@@ -1,31 +0,0 @@
-?package(menu): needs=x11 section="/" title="Use Office Tools" icon="office_section.png" order="_mergemenu_,Create a Text Document,Create a Spreadsheet,Create a Presentation,Create a Drawing,kivio,Design a Layout,kontact-kaddressbook,kdeprintfax,kfax,kpilot,kcalc,kdict,_mergefile_,_separator_,Use More Office Tools,_separator_,Other"
-?package(menu): needs=x11 section="Use Office Tools" title="Use More Office Tools" icon="office_section.png" order="Wordprocessors,Spreadsheets,Presentations,Drawing,Graphs,Publishing,Tasks Management,Time Management,Address Books,Communications,Accessories,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="/" title="Organize" icon="timemanagement_section.png" order="_mergemenu_,kontact-knotes,kontact-korganizer,kontact-korganizer-time,karm,Manage Projects,Manage Your Finances,_mergefile_,_separator_,Use More Productivity Tools,_separator_,Other"
-?package(menu): needs=x11 section="Organize" title="Use More Productivity Tools" icon="timemanagement_section.png"
-?package(menu): needs=x11 section="Organize/Use More Productivity Tools" title="Finances" icon="finances_section.png"
-?package(menu): needs=x11 section="Organize/Use More Productivity Tools" title="Tasks Management" icon="taskmanagement_section.png"
-?package(menu): needs=x11 section="Organize/Use More Productivity Tools" title="Time Management" icon="timemanagement_section.png"
-?package(menu): needs=x11 section="/" title="Surf the Internet" icon="internet_section.png" order="_mergemenu_,konqueror,kontact-KMail,kopete,kontact-KNode,Organize a Video Conference,kphone,quanta,kbear,Kppp,_mergefile_,_separator_,Use More Internet Software,_separator_,Use More Connectivity Utilities,_separator_,Other"
-?package(menu): needs=x11 section="Surf the Internet" title="Use More Connectivity Utilities" icon="internet_section.png" order="Remote Access,Web Browsers,Mail,Instant Messaging,Chat,News,File Transfer,Video Conference,Web Editors,_separator,Other,_mergemenu_,_mergefile_" excludefiles="Mandrakelinux-Internet-InstantMessaging-kopete.desktop"
-?package(menu): needs=x11 section="/" title="Enjoy Music and Video" icon="multimedia_section.png" order="_mergemenu_,kmix,kscd,amarok,kaudiocreator,Record Sounds,Mix Music,rosegarden,kaffeine,kdenlive,kdetv,_mergefile_,_separator_,Discover More Entertainment Options,_separator_,Other"
-?package(menu): needs=x11 section="Enjoy Music and Video" title="Discover More Entertainment Options" icon="multimedia_section.png" order="Sound,Video,Graphics,Other,_mergemenu_,_mergefile_" 
-?package(menu): needs=x11 section="Enjoy Music and Video/Discover More Entertainment Options" title="Sound" icon="sound_section.png"  excludefiles="Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-kmix.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-kscd.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-Totem Media Player.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-kaudiocreator.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-Audacity.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-amarok.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-rosegarden.desktop"
-?package(menu): needs=x11 section="Enjoy Music and Video/Discover More Entertainment Options" title="Video" icon="video_section.png" 
-?package(menu): needs=x11 section="/" title="View, Modify and Create Graphics" icon="graphics_section.png" order="_mergemenu_,kuickshow,Edit Images and Photos,kooka,digikam,ksnapshot,_mergefile_,_separator_,Use More Image Editing Tools,_separator_,Other"
-?package(menu): needs=x11 section="View, Modify and Create Graphics" title="Use More Image Editing Tools" icon="graphics_section.png"
-?package(menu): needs=x11 section="/" title="Play Games" icon="amusement_section.png" order="_mergemenu_,Frozen-Bubble,ArmageTron,Cannon Smash,Chromium,LBreakout 2,Ppracer,Crack Attack! - Solo,_mergefile_,_separator_,Play More Games,_separator_,Other"
-?package(menu): needs=x11 section="Play Games" title="Play More Games" icon="amusement_section.png" order="Adventure,Arcade,Boards,Cards,Puzzles,Sports,Strategy,Toys,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="/" title="Administer Your System" icon="configuration_section.png" order="_mergemenu_,KControl,Configure Your Computer,kdepasswd,k3b,Backup Your Data,ark,KFloppy,konsole,_mergefile_,_separator_,Use More Administration Tools,_separator_,Other"
-?package(menu): needs=x11 section="Administer Your System" title="Use More Administration Tools" icon="system_section.png" order="Terminals,Text Tools,Configuration,Archiving,File Tools,Monitoring,Session,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Administer Your System/Use More Administration Tools" title="Accessibility" icon="accessibility_section.png" 
-?package(menu): needs=x11 section="Administer Your System/Use More Administration Tools" title="Communications" icon="communications_section.png"
-?package(menu): needs=x11 section="/" title="Read Documentation" icon="documentation_section.png" order="_mergefile_,_separator_,_mergemenu_,Other"
-?package(menu): needs=x11 section="Read Documentation" title="Read More Documentation" icon="documentation_section.png"
-?package(menu): needs=x11 section="/" title="Develop" icon="development_section.png"
-?package(menu): needs=x11 section="/" title="Use Education Software" icon="education_section.png"
-?package(menu): needs=x11 section="Use Education Software" title="Use More Education Software" icon="education_section.png" order="Economy,Geography,History,Languages,Literature,Sciences,Sports,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="/" title="Use Scientific Software" icon="sciences_section.png"
-?package(menu): needs=x11 section="Use Scientific Software" title="Use More Sciences Software" icon="sciences_section.png" order="Artificial Intelligence,Astronomy,Biology,Chemistry,Computer Science,Data Visualization,Electricity,Geosciences,Image Processing,Mathematics,Numeric analysis,Parallel Computing,Physics,Robotics,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="/" title="Use Emulators" icon="emulators_section.png"
-?package(menu): needs=x11 section="/" title="Use More Applications" icon="more_applications_other_section.png" order="Accessibility,Development,Editors,Emulators,Finances,Databases,Education,Sciences,Communications,Games,Documentation,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Develop" title="Use More Development Software" icon="development_section.png" order="Development Environment,Interpreter,Tools,Code Generators,_mergemenu_,_mergefile_"
diff --git a/menu/translate_menus b/menu/translate_menus
deleted file mode 100644
index 097f9fa..0000000
--- a/menu/translate_menus
+++ /dev/null
@@ -1,109 +0,0 @@
-#  /etc/menu-methods/menu-translate file for update-menus.
-#
-#
-#
-#  NOTE: if you want to translate the menu entries in a different language,
-#        DO NOT USE THIS FILE!!!
-#        use the gnu internationalisation tools, see the menu source
-#	 code (menu/messages/README), and send the .po file you created
-#	 to me, I'll include it in a next release of menu. 
-#
-#
-#synopsis:
-#
-#translate x -> y    #where x and y are one of section, id, title, icon, ...
-#  x-name  y-name
-#  ...
-#endtranslate
-#
-#The translations are done by update-menus: the menu-methods will not
-#have to be aware of this.
-#
-
-#there's:
-#  translate:     only translate for exact matches (RE "^$match\$"
-#  subtranslate:  translate for matches of RE "^$match"
-#  substitute:    substitute substrings: sed -s "/^$match/$repl/".
-#                 this only works for "substitute x->x", and
-#		  will give interesting results for " substitute x->y".
-# 
-#the following will map all Apps/Games sections into Games
-# (the /etc/menu-methods will never even know Apps/Games exists,
-#  no matter how many packages still use that):
-#
-#
-# Language translators: DO NOT USE THIS FILE! (see note on top of this file)
-
-
-substitute section->section
-  Configuration  System/Configuration
-
-  "Applications/Publishing"                               Office/Publishing
-  Applications/Archiving                                  System/Archiving
-  "Applications/File tools"                               "System/File Tools"
-  Applications/Monitoring                                 System/Monitoring
-  "Applications/Text tools"                               "System/Text Tools"
-  Applications                                            "More Applications"
-
-  Terminals                                               System/Terminals
-
-  Documentation                                           "More Applications/Documentation"
-
-  Office/PDA                                              Office/Communications/PDA
-
-  Networking/IRC                                          Internet/Chat
-  Networking/WWW                                          "Internet/Web Browsers"
-  Networking                                              Internet
-
-  Amusement                                               "More Applications/Games"
-
-  Session/WindowManagers                                  System/Session/Windowmanagers
-
-  "Office/Address books"                                  "Office/Address Books"
-  "Office/Tasks management"                               "Office/Tasks Management"
-  "Office/Time management"                                "Office/Time Management"
-  "Networking/File transfer"                              "Internet/File Transfer"
-  "Internet/File transfer"                                "Internet/File Transfer"
-  "Networking/Instant messaging"                          "Internet/Instant Messaging"
-  "Internet/Instant messaging"                            "Internet/Instant Messaging"
-  "Networking/Remote access"                              "Internet/Remote Access"
-  "Internet/Remote access"                                "Internet/Remote Access"
-  "Internet/Video conference"                             "Internet/Video Conference"
-  "Networking/Video conference"                           "Internet/Video Conference"
-  "Internet/Web browsers"                                 "Internet/Web Browsers"
-  "Networking/Web browsers"                               "Internet/Web Browsers"
-  "Internet/Web editors"                                  "Internet/Web Editors"
-  "Networking/Web editors"                                "Internet/Web Editors"
-  "System/Archiving/Cd burning"                           "System/Archiving/CD Burning"
-  "Applications/Archiving/Cd burning"                     "System/Archiving/CD Burning"
-  "System/File tools"                                     "System/File Tools"
-  "System/Text tools"                                     "System/Text Tools"
-  "More applications"                                     "More Applications"
-  "More applications/Development/Code generators"         "More Applications/Development/Code Generators"
-  "Applications/Development/Code generators"              "More Applications/Development/Code Generators"
-  "More applications/Development/Development environments" "More Applications/Development/Development Environments"
-  "Applications/Development/Development environments"    "More Applications/Development/Development Environments"
-  "More applications/Sciences/Artificial intelligence"    "More Applications/Sciences/Artificial Intelligence"
-  "Applications/Sciences/Artificial intelligence"         "More Applications/Sciences/Artificial Intelligence"
-  "More applications/Sciences/Data visualization"         "More Applications/Sciences/Data Visualization"
-  "Applications/Sciences/Data visualization"              "More Applications/Sciences/Data Visualization"
-  "More applications/Sciences/Image processing"           "More Applications/Sciences/Image Processing"
-  "Applications/Sciences/Image processing"                "More Applications/Sciences/Image Processing"
-  "More applications/Sciences/Numeric analysis"           "More Applications/Sciences/Numeric Analysis"
-  "Applications/Sciences/Numeric analysis"                "More Applications/Sciences/Numeric Analysis"
-  "More applications/Sciences/Parallel computing"         "More Applications/Sciences/Parallel Computing"
-  "Applications/Sciences/Parallel computing"              "More Applications/Sciences/Parallel Computing"
-endtranslate
-
-# 
-# #this could be for those who want different names
-# translate title->title
-#   Gnuplot    "GnuTeken"
-#   Dosemu     "A better DOS than DOS (sometimes)"
-# endtranslate
-# 
-#translate id->title
-#  include /usr/lib/menus/LANGUAGE/finnish
-#  menu/apps/editors  TekstVeranderaars
-#endtranslate
-# 
diff --git a/menu/translate_menus-simplified b/menu/translate_menus-simplified
deleted file mode 100644
index dde4ab6..0000000
--- a/menu/translate_menus-simplified
+++ /dev/null
@@ -1,98 +0,0 @@
-# Language translators: DO NOT USE THIS FILE! (see note on top of this file)
-
-
-substitute section->section
-  "Office/Tasks management"                               "Organize/Use More Productivity Tools/Tasks Management"
-  "Office/Time management"                               "Organize/Use More Productivity Tools/Time Management"
-  "Office/Tasks Management"                               "Organize/Use More Productivity Tools/Tasks Management"
-  "Office/Time Management"                               "Organize/Use More Productivity Tools/Time Management"
-  Office                                                  "Use Office Tools/Use More Office Tools"
-  "More Applications/Finances"                            "Organize/Use More Productivity Tools/Finances"
-
-  Internet                                                "Surf the Internet/Use More Connectivity Utilities"
-
-  Multimedia/Video                                              "Enjoy Music and Video/Discover More Entertainment Options/Video"
-  Multimedia/Sound                                              "Enjoy Music and Video/Discover More Entertainment Options/Sound"
-  Multimedia/Graphics                                           "View, Modify and Create Graphics/Use More Image Editing Tools"
-
-  "More Applications/Games"                                                    "Play Games/Play More Games"
-  Amusement                                               "Play Games/Play More Games"
-
-  System                                                        "Administer Your System/Use More Administration Tools"
-  "More Applications/Development"                              "Develop/Use More Development Software"
-  "More Applications/Education"                              "Use Education Software/Use More Education Software"
-  "More Applications/Sciences"                              "Use Scientific Software/Use More Sciences Software"
-
-  "More Applications/Accessibility"                         "Administer Your System/Use More Administration Tools/Accessibility"
-  "More Applications/Communications"                         "Administer Your System/Use More Administration Tools/Communications"
-
-  
-  "More Applications/Other"                                           "Use More Applications"
-  "More Applications/Emulators"                                 "Use Emulators"
-  "More Applications/Documentation"                             "Read Documentation/Read More Documentation"
-  "More Applications"                                           "Use More Applications"
-
-
-#### below a modified copy of the main system translation map, adapted for simplified menu
-
-
-  Configuration  "Administer Your System/Use More Administration Tools/Configuration"
-
-  "Applications/Publishing"                               "Use Office Tools/Use More Office Tools/Publishing"
-  Applications/Archiving                                  "Administer Your System/Use More Administration Tools/Archiving"
-  "Applications/File tools"                               "Administer Your System/Use More Administration Tools/File tools"
-  Applications/Monitoring                                 "Administer Your System/Use More Administration Tools/Monitoring"
-  "Applications/Text tools"                               "Administer Your System/Use More Administration Tools/Text tools"
-  Applications                                            "Use More Applications"
-
-  Terminals                                               "Administer Your System/Use More Administration Tools/Terminals"
-
-  Documentation                                           "Read Documentation/Read More Documentation"
-
-  Office/PDA                                              "Use Office Tools/Use More Office Tools/Communications/PDA"
-
-  Networking/IRC                                          "Surf the Internet/Use More Connectivity Utilities/Chat"
-  Networking/WWW                                          "Surf the Internet/Use More Connectivity Utilities/Web Browsers"
-  Networking                                              "Surf the Internet/Use More Connectivity Utilities"
-
-  Amusement                                               "Play Games/Play More Games"
-
-  Session/WindowManagers                                  "Administrer Your System/Use More Administration Tools/Windowmanagers"
-
-  "Office/Address books"                                  "Use Office Tools/Use More Office Tools/Address Books"
-  "Office/Tasks management"                               "Organize/Use More Productivity Tools/Tasks Management"
-  "Office/Time management"                                "Organize/Use More Productivity Tools/Time Management"
-  "Networking/File transfer"                              "Surf the Internet/Use More Connectivity Utilities/File Transfer"
-  "Internet/File transfer"                                "Surf the Internet/Use More Connectivity Utilities/File Transfer"
-  "Networking/Instant messaging"                          "Surf the Internet/Use More Connectivity Utilities/Instant Messaging"
-  "Internet/Instant messaging"                            "Surf the Internet/Use More Connectivity Utilities/Instant Messaging"
-  "Networking/Remote access"                              "Surf the Internet/Use More Connectivity Utilities/Remote Access"
-  "Internet/Remote access"                                "Surf the Internet/Use More Connectivity Utilities/Remote Access"
-  "Internet/Video conference"                             "Surf the Internet/Use More Connectivity Utilities/Video Conference"
-  "Networking/Video conference"                           "Surf the Internet/Use More Connectivity Utilities/Video Conference"
-  "Internet/Web browsers"                                 "Surf the Internet/Use More Connectivity Utilities/Web Browsers"
-  "Networking/Web browsers"                               "Surf the Internet/Use More Connectivity Utilities/Web Browsers"
-  "Internet/Web editors"                                  "Surf the Internet/Use More Connectivity Utilities/Web Editors"
-  "Networking/Web editors"                                "Surf the Internet/Use More Connectivity Utilities/Web Editors"
-  "System/Archiving/Cd burning"                           "Administer Your System/Use More Administration Tools/Archiving/CD Burning"
-  "Applications/Archiving/Cd burning"                     "Administer Your System/Use More Administration Tools/Archiving/CD Burning"
-  "System/File tools"                                     "Administer Your System/Use More Administration Tools/File Tools"
-  "System/Text tools"                                     "Administer Your System/Use More Administration Tools/Text Tools"
-  "More applications"                                     "Use More Applications"
-  "More applications/Development/Code generators"         "Develop/Use More Development Software/Code Generators"
-  "Applications/Development/Code generators"              "Develop/Use More Development Software/Code Generators"
-  "More applications/Development/Development environments" "Develop/Use More Development Software/Development Environments"
-  "Applications/Development/Development environments"    "Develop/Use More Development Software/Development Environments"
-  "More applications/Sciences/Artificial intelligence"    "Use Scientific Software/Use More Sciences Software/Artificial Intelligence"
-  "Applications/Sciences/Artificial intelligence"         "Use Scientific Software/Use More Sciences Software/Artificial Intelligence"
-  "More applications/Sciences/Data visualization"         "Use Scientific Software/Use More Sciences Software/Data Visualization"
-  "Applications/Sciences/Data visualization"              "Use Scientific Software/Use More Sciences Software/Data Visualization"
-  "More applications/Sciences/Image processing"           "Use Scientific Software/Use More Sciences Software/Image Processing"
-  "Applications/Sciences/Image processing"                "Use Scientific Software/Use More Sciences Software/Image Processing"
-  "More applications/Sciences/Numeric analysis"           "Use Scientific Software/Use More Sciences Software/Numeric Analysis"
-  "Applications/Sciences/Numeric analysis"                "Use Scientific Software/Use More Sciences Software/Numeric Analysis"
-  "More applications/Sciences/Parallel computing"         "Use Scientific Software/Use More Sciences Software/Parallel Computing"
-  "Applications/Sciences/Parallel computing"              "Use Scientific Software/Use More Sciences Software/Parallel Computing"
-
-endtranslate
-
-- 
cgit v1.2.1