--- ./layout/applications.menu.orig	2008-01-07 23:27:42.000000000 +0100
+++ ./layout/applications.menu	2008-03-17 12:09:16.000000000 +0100
@@ -7,7 +7,7 @@
   <Directory>Applications.directory</Directory>
 
   <!-- Scan legacy dirs first, as later items take priority -->
-  <KDELegacyDirs/>
+  <!-- <KDELegacyDirs/> -->
   <LegacyDir>/etc/X11/applnk</LegacyDir>
   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
 
@@ -24,12 +24,20 @@
     <Directory>Accessories.directory</Directory>
     <Include>
       <And>
-        <Category>Utility</Category>
+        <Or>
+          <Category>Utility</Category>
+          <Category>TextEditor</Category>
+        </Or>
         <Not>
           <Category>System</Category>
         </Not>
       </And>
     </Include>
+    <Exclude>
+        <Category>KDE</Category>
+        <Category>X-XFCE</Category>
+        <Filename>mousepad.desktop</Filename>
+    </Exclude>
   </Menu> <!-- End Accessories -->
 
   <!-- Accessibility submenu -->
@@ -44,6 +52,10 @@
         </Not>
       </And>
     </Include>
+    <Exclude>
+        <Category>KDE</Category>
+        <Category>X-XFCE</Category>
+    </Exclude>
   </Menu> <!-- End Accessibility -->
 
   <!-- Development Tools -->
@@ -56,6 +68,10 @@
       </And>
       <Filename>emacs.desktop</Filename>
     </Include>
+    <Exclude>
+        <Category>KDE</Category>
+        <Category>X-XFCE</Category>
+    </Exclude>
   </Menu> <!-- End Development Tools -->
 
   <!-- Education -->
@@ -67,6 +83,10 @@
         <Category>Education</Category>
       </And>
     </Include>
+    <Exclude>
+        <Category>KDE</Category>
+        <Category>X-XFCE</Category>
+    </Exclude>
   </Menu> <!-- End Education -->
 
   <!-- Games -->
@@ -78,6 +98,10 @@
         <Category>Game</Category>
       </And>
     </Include>
+    <Exclude>
+        <Category>KDE</Category>
+        <Category>X-XFCE</Category>
+    </Exclude>
   </Menu> <!-- End Games -->
 
   <!-- Graphics -->
@@ -89,6 +113,11 @@
         <Category>Graphics</Category>
       </And>
     </Include>
+    <Exclude>
+        <Category>KDE</Category>
+        <Category>X-XFCE</Category>
+        <Filename>ristretto.desktop</Filename>
+    </Exclude>
   </Menu> <!-- End Graphics -->
 
   <!-- Internet -->
@@ -100,6 +129,10 @@
         <Category>Network</Category>
       </And>
     </Include>
+    <Exclude>
+        <Category>KDE</Category>
+        <Category>X-XFCE</Category>
+    </Exclude>
   </Menu>   <!-- End Internet -->
 
   <!-- Multimedia -->
@@ -111,6 +144,10 @@
         <Category>AudioVideo</Category>
       </And>
     </Include>
+    <Exclude>
+        <Category>KDE</Category>
+        <Category>X-XFCE</Category>
+    </Exclude>
   </Menu>   <!-- End Multimedia -->
 
   <!-- Office -->
@@ -119,9 +156,17 @@
     <Directory>Office.directory</Directory>
     <Include>
       <And>
-        <Category>Office</Category>
+        <Or>
+          <Category>Office</Category>
+          <Category>Calendar</Category>
+        </Or>
       </And>
     </Include>
+    <Exclude>
+        <Category>KDE</Category>
+        <Category>X-XFCE</Category>
+        <Filename>xfbib.desktop</Filename>
+    </Exclude>
   </Menu> <!-- End Office -->
 
   <!-- System Tools-->
@@ -134,6 +179,13 @@
         <Not><Category>Settings</Category></Not>
       </And>
     </Include>
+    <Exclude>
+        <Category>KDE</Category>
+        <Category>X-XFCE</Category>
+        <Filename>Thunar.desktop</Filename>
+        <Filename>Thunar-bulk-rename.desktop</Filename>
+        <Filename>Terminal.desktop</Filename>
+    </Exclude>
   </Menu>   <!-- End System Tools -->
 
   <!-- Other -->
@@ -148,6 +200,25 @@
         <Not><Category>Screensaver</Category></Not>
       </And>
     </Include>
+    <Exclude>
+        <Category>KDE</Category>
+        <Category>X-XFCE</Category>
+    </Exclude>
   </Menu> <!-- End Other -->
 
+  <Menu>
+     <Name>KDE Applications</Name>
+     <MergeFile>gnome-menus-kde.menu</MergeFile>
+  </Menu>
+
+  <Menu>
+     <Name>OpenOffice.Org</Name>
+     <MergeFile>gnome-menus-ooo.menu</MergeFile>
+  </Menu>
+
+  <Menu>
+     <Name>Xfce Applications</Name>
+     <MergeFile>gnome-menus-xfce.menu</MergeFile>
+  </Menu>
+
 </Menu> <!-- End Applications -->