--- modules/vfolder/applications-all-users.vfolder-info.in.orig	Fri Oct 17 10:11:22 2003
+++ modules/vfolder/applications-all-users.vfolder-info.in	Thu Feb 12 15:15:40 2004
@@ -19,7 +19,14 @@
   <MergeDir>/usr/share/gnome/apps/</MergeDir>
 
   <!-- Merge dirs optional -->
-  <MergeDir>/etc/X11/applnk/</MergeDir>
+  <MergeDir>/usr/local/share/applnk/Toys/</MergeDir>
+  <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir>
+  <MergeDir>/usr/local/share/applnk/Internet/</MergeDir>
+  <MergeDir>/usr/local/share/applnk/Office/</MergeDir>
+  <MergeDir>/usr/local/share/applnk/Applications/</MergeDir>
+  <MergeDir>/usr/local/share/applnk/Development/</MergeDir>
+  <MergeDir>/usr/local/share/applnk/Games/</MergeDir>
+  <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir>
 
   <!-- Root folder -->
   <Folder>
@@ -34,10 +41,12 @@
     <Query>
       <And>
         <Keyword>Core</Keyword>
-	<!-- FIXME: Seth, why would this be wanted? -->
-	<!--<Not>
-	  <Keyword>Merged</Keyword>
-        </Not>-->
+	<Not>
+          <Or>
+            <Keyword>Qt</Keyword>
+            <Keyword>KDE</Keyword>
+          </Or>
+	</Not>
       </And>
     </Query>
 
@@ -47,6 +56,12 @@
       <Desktop>Accessories.directory</Desktop>
       <Query>
 	<And>
+	  <Not>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+	  </Not>
 	  <Keyword>Application</Keyword>
 	  <Keyword>Utility</Keyword>
 	  <Not>
@@ -63,6 +78,12 @@
       <Desktop>Accessibility.directory</Desktop>
       <Query>
 	<And>
+	  <Not>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+	  </Not>
 	  <Keyword>Application</Keyword>
 	  <Keyword>Accessibility</Keyword>
 	  <Not>
@@ -80,6 +101,12 @@
       <OnlyUnallocated/>
       <Query>
 	<And>
+	  <Not>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+	  </Not>
           <Keyword>Application</Keyword>
           <Not>
             <Keyword>Settings</Keyword>
@@ -101,6 +128,12 @@
       <Desktop>Development.directory</Desktop>
       <Query>
         <And>
+	  <Not>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+	  </Not>
           <Keyword>Application</Keyword>
 	  <Keyword>Development</Keyword>
         </And>
@@ -114,6 +147,12 @@
       <Desktop>Games.directory</Desktop>
       <Query>
         <And>
+	  <Not>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+	  </Not>
           <Keyword>Application</Keyword>
 	  <Keyword>Game</Keyword>
         </And>
@@ -127,6 +166,12 @@
       <Desktop>Graphics.directory</Desktop>
       <Query>
         <And>
+	  <Not>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+	  </Not>
           <Keyword>Application</Keyword>
 	  <Keyword>Graphics</Keyword>
         </And>
@@ -140,6 +185,12 @@
       <Desktop>Internet.directory</Desktop>
       <Query>
         <And>
+	  <Not>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+	  </Not>
           <Keyword>Application</Keyword>
 	  <Keyword>Network</Keyword>
         </And>
@@ -153,6 +204,12 @@
       <Desktop>Multimedia.directory</Desktop>
       <Query>
         <And>
+	  <Not>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+	  </Not>
           <Keyword>Application</Keyword>
 	  <Keyword>AudioVideo</Keyword>
         </And>
@@ -170,6 +227,12 @@
       <Desktop>Office.directory</Desktop>
       <Query>
 	<And>
+	  <Not>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+	  </Not>
 	  <Keyword>Application</Keyword>
 	  <Or>
 	    <Keyword>Office</Keyword>
@@ -195,6 +258,12 @@
       <Desktop>System.directory</Desktop>
       <Query>
         <And>
+	  <Not>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+	  </Not>
           <Keyword>Application</Keyword>
           <Not>
             <Keyword>Settings</Keyword>
@@ -204,6 +273,118 @@
       </Query>
       <DontShowIfEmpty/>
     </Folder>
-    
+
+    <!-- KDE -->
+    <Folder>
+      <Name>KDE</Name>
+      <Desktop>KDE.directory</Desktop>
+
+      <!-- KAccessories -->
+      <Folder>
+        <Name>Accessories</Name>
+        <Desktop>Accessories.directory</Desktop>
+        <Query>
+          <And>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+            <Keyword>Utility</Keyword>
+          </And>
+        </Query>
+        <DontShowIfEmpty/>
+      </Folder>
+
+      <!-- KDevelopment Tools -->
+      <Folder>
+        <Name>Programming</Name>
+        <Desktop>Development.directory</Desktop>
+        <Query>
+          <And>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+            <Keyword>Development</Keyword>
+          </And>
+        </Query>
+        <DontShowIfEmpty/>
+      </Folder>
+
+      <!-- KGraphics -->
+      <Folder>
+        <Name>Graphics</Name>
+        <Desktop>Graphics.directory</Desktop>
+        <Query>
+          <And>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+            <Keyword>Graphics</Keyword>
+          </And>
+        </Query>
+        <DontShowIfEmpty/>
+      </Folder>
+
+      <!-- KInternet -->
+      <Folder>
+        <Name>Internet</Name>
+        <Desktop>Internet.directory</Desktop>
+        <Query>
+          <And>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+            <Keyword>Network</Keyword>
+          </And>
+        </Query>
+
+        <Include>/usr/local/share/applnk/konqueror.desktop</Include>
+
+        <DontShowIfEmpty/>
+      </Folder>
+
+      <!-- KMultimedia -->
+      <Folder>
+        <Name>Multimedia</Name>
+        <Desktop>Multimedia.directory</Desktop>
+        <Query>
+          <And>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+            <Keyword>AudioVideo</Keyword>
+          </And>
+        </Query>
+        <DontShowIfEmpty/>
+      </Folder>
+
+      <!-- KOffice -->
+      <Folder>
+        <Name>Office</Name>
+        <Desktop>Office.directory</Desktop>
+        <Query>
+          <And>
+            <Or>
+              <Keyword>Qt</Keyword>
+              <Keyword>KDE</Keyword>
+            </Or>
+            <Or>
+              <Keyword>Office</Keyword>
+              <Keyword>Spreadsheet</Keyword>
+              <Keyword>WordProcessor</Keyword>
+              <Keyword>Calendar</Keyword>
+              <Keyword>ProjectManagement</Keyword>
+            </Or>
+          </And>
+        </Query>
+        <DontShowIfEmpty/>
+      </Folder>
+      <DontShowIfEmpty/>
+    </Folder> <!-- KDE -->
+
   </Folder>
 </VFolderInfo>