From 955686e61bab53a6e85de368a05db13cf72b5fea Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Wed, 14 Mar 2012 21:34:34 -0500
Subject: Further organize TDE Menu.

---
 admin                  |   2 +-
 kded/applications.menu | 887 ++++++++++++++++++++++++++-----------------------
 2 files changed, 466 insertions(+), 423 deletions(-)

diff --git a/admin b/admin
index eb886af35..1e5f9378a 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit eb886af35eccf31b370f56bd3d901e9804859e06
+Subproject commit 1e5f9378a47b7a809f3027ae8f39ef5062825756
diff --git a/kded/applications.menu b/kded/applications.menu
index 380196e94..7f9f12a08 100644
--- a/kded/applications.menu
+++ b/kded/applications.menu
@@ -1,429 +1,472 @@
- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
   "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
 
 <Menu>
-	<Name>Applications</Name>
-	<Directory>kde-main.directory</Directory>
-	<!-- Search the default locations -->
-	<KDELegacyDirs/>
-	<DefaultAppDirs/>
-	<DefaultDirectoryDirs/>
-	<DefaultLayout>
-		<Merge type="menus"/>
-		<Merge type="files"/>
-		<Separator/>
-		<Menuname>More</Menuname>
-	</DefaultLayout>
-	<Layout>
-		<Merge type="menus"/>
-		<Menuname>Applications</Menuname>
-		<Merge type="files"/>
-	</Layout>
+  <Name>Applications</Name>
+  <Directory>kde-main.directory</Directory>
+  <!-- Search the default locations -->
+  <KDELegacyDirs/>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <DefaultLayout>
+    <Merge type="menus"/>
+    <Merge type="files"/>
+    <Separator/>
+    <Menuname>More</Menuname>
+  </DefaultLayout>
+  <Layout>
+    <Merge type="menus"/>
+    <Menuname>Applications</Menuname>
+    <Merge type="files"/>
+  </Layout>
 
-	<Menu>
-		<Name>Applications</Name>
-		<Directory>kde-unknown.directory</Directory>
-		<OnlyUnallocated/>
-		<Include>
-			<Not>
-				<!-- Don't list non-KDE core applications -->
-				<And>
-					<Category>Core</Category>
-					<Not><Category>KDE</Category></Not>
-				</And>
-				<!-- Don't list SUSE's YaST in here -->
-				<Category>X-SuSE-YaST</Category>
-			</Not>
-		</Include>
-	</Menu>
-       <Menu>
-                <Name>Development</Name>
-                <Directory>kde-development.directory</Directory>
-                <Menu>
-                        <Name>X-KDE-KDevelopIDE</Name>
-                        <Directory>kde-development-tdevelop.directory</Directory>
-                        <Include>
-                                <And>
-                                <Category>Development</Category>
-                                <Category>X-KDE-KDevelopIDE</Category>
-                                </And>
-                        </Include>
-                </Menu>
-		<Menu>
-			<Name>Translation</Name>
-			<Directory>kde-development-translation.directory</Directory>
-			<Include>
-				<And>
-				<Category>Development</Category>
-				<Category>Translation</Category>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>Web Development</Name>
-			<Directory>kde-development-webdevelopment.directory</Directory>
-			<Include>
-				<And>
-				<Category>Development</Category>
-				<Category>WebDevelopment</Category>
-				</And>
-			</Include>
-		</Menu>
-                <Include>
-                        <And>
-                        <Category>Development</Category>
-                        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
-                        <Not><Category>Translation</Category></Not>
-                        <Not><Category>WebDevelopment</Category></Not>
-                        </And>
-                </Include>
-        </Menu>
-	<Menu>
-		<Name>Science</Name>
-		<Directory>kde-science.directory</Directory>
-		<Include>
-			<And><!-- Include /any/ Science app which is not an Education app -->
-				<Or>
-					<Category>Astronomy</Category>
-					<Category>Biology</Category>
-					<Category>Chemistry</Category>
-					<Category>Geology</Category>
-					<Category>MedicalSoftware</Category>
-					<Category>Physics</Category>
-					<Category>Math</Category>
-					<Category>Science</Category>
-				</Or>
-				<Not><Category>Education</Category></Not>
-			</And>
-		</Include>
-	</Menu>
-	<Menu>
-		<Name>Edutainment</Name>
-		<Directory>kde-edutainment.directory</Directory>
-		<Menu>
-			<Name>Languages</Name>
-			<Directory>kde-edu-languages.directory</Directory>
-			<Include>
-				<And>
-				<Category>Education</Category>
-				<Or>
-				<Category>Languages</Category>
-				<Category>X-KDE-Edu-Language</Category>
-				</Or>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>Mathematics</Name>
-			<Directory>kde-edu-mathematics.directory</Directory>
-			<Include>
-				<And>
-				<Category>Education</Category>
-				<Category>Math</Category>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>Miscellaneous</Name>
-			<Directory>kde-edu-miscellaneous.directory</Directory>
-			<Include>
-				<And>
-				<Category>Education</Category>
-				<Not>
-				<Category>Languages</Category>
-				<Category>X-KDE-Edu-Language</Category>
-				<Category>Math</Category>
-				<Category>Science</Category>
-				<Category>Teaching</Category>
-				<Category>X-KDE-Edu-Teaching</Category>
-				</Not>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>Science</Name>
-			<Directory>kde-edu-science.directory</Directory>
-			<Include>
-				<And>
-				<Category>Education</Category>
-				<Category>Science</Category>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>Tools</Name>
-			<Directory>kde-edu-tools.directory</Directory>
-			<Include>
-				<And>
-				<Category>Education</Category>
-				<Or>
-				<Category>Teaching</Category>
-				<Category>X-KDE-Edu-Teaching</Category>
-				</Or>
-				</And>
-			</Include>
-		</Menu>
-	</Menu>
-	<Menu>
-		<Name>Games</Name>
-		<Directory>kde-games.directory</Directory>
-		<Menu>
-			<Name>Arcade</Name>
-			<Directory>kde-games-arcade.directory</Directory>
-			<Include>
-				<And>
-				<Category>Game</Category>
-				<Category>ArcadeGame</Category>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>Board</Name>
-			<Directory>kde-games-board.directory</Directory>
-			<Include>
-				<And>
-				<Category>Game</Category>
-				<Category>BoardGame</Category>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>Card</Name>
-			<Directory>kde-games-card.directory</Directory>
-			<Include>
-				<And>
-				<Category>Game</Category>
-				<Category>CardGame</Category>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>Kidsgames</Name>
-			<Directory>kde-games-kids.directory</Directory>
-			<Include>
-				<And>
-				<Category>Game</Category>
-				<Or>
-				<Category>X-KDE-KidsGame</Category>
-				<Category>KidsGame</Category>
-				</Or>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>TacticStrategy</Name>
-			<Directory>kde-games-strategy.directory</Directory>
-			<Include>
-				<And>
-				<Category>Game</Category>
-				<Category>StrategyGame</Category>
-				</And>
-			</Include>
-		</Menu>
-		<Include>
-			<And>
-			<Category>Game</Category>
-			<Not>
-			<Category>ArcadeGame</Category>
-			<Category>BoardGame</Category>
-			<Category>CardGame</Category>
-			<Category>X-KDE-KidsGame</Category>
-			<Category>KidsGame</Category>
-			<Category>StrategyGame</Category>
-			</Not>
-			</And>
-		</Include>
-               <Menu>
-                        <Name>Toys</Name>
-                        <Directory>kde-toys.directory</Directory>
-                        <Include>
-                                 <Category>Amusement</Category>
-                        </Include>
-               </Menu>
-	</Menu>
-	<Menu>
-		<Name>Graphics</Name>
-		<Directory>kde-graphics.directory</Directory>
-		<Include>
-			<And>
-			<Category>Graphics</Category>
-			<Not><Category>X-KDE-More</Category></Not>
-			<Not><Filename>ooo-draw.desktop</Filename></Not>
-			</And>
-		</Include>
-		<Menu>
-			<Name>More</Name>
-			<Directory>kde-more.directory</Directory>
-			<Include>
-				<And>
-				<Category>Graphics</Category>
-				<Category>X-KDE-More</Category>
-				</And>
-			</Include>
-		</Menu>
-	</Menu>
-	<Menu>
-		<Name>Internet</Name>
-		<Directory>kde-internet.directory</Directory>
-		<Include>
-			<And>
-			<Category>Network</Category>
-			<Not><Category>X-KDE-More</Category></Not>
-			</And>
-		</Include>
-		<Menu>
-		  <Name>Terminal</Name>
-		  <Directory>kde-internet-terminal.directory</Directory>
-		</Menu>
-		<Menu>
-			<Name>More</Name>
-			<Directory>kde-more.directory</Directory>
-			<Include>
-				<And>
-				<Category>Network</Category>
-				<Category>X-KDE-More</Category>
-				</And>
-			</Include>
-		</Menu>
-	</Menu>
-	<Menu>
-		<Name>Multimedia</Name>
-		<Directory>kde-multimedia.directory</Directory>
-		<Include>
-			<And>
-			<Category>AudioVideo</Category>
-			<Not><Category>X-KDE-More</Category></Not>
-			</And>
-		</Include>
-		<Menu>
-			<Name>More</Name>
-			<Directory>kde-more.directory</Directory>
-			<Include>
-				<And>
-				<Category>AudioVideo</Category>
-				<Category>X-KDE-More</Category>
-				</And>
-			</Include>
-		</Menu>
-	</Menu>
-	<Menu>
-		<Name>Office</Name>
-		<Directory>kde-office.directory</Directory>
-		<Layout>
-			<Merge type="menus"/>
-			<Merge type="files"/>
-			<Separator/>
-			<Menuname>More</Menuname>
-		</Layout>
-		<Include>
-                        <And>
-			<Category>Office</Category>
-                        <Not><Category>X-KDE-More</Category></Not>
-                        </And>
-			<Filename>ooo-draw.desktop</Filename>
-                </Include>
-                <Menu>
-                        <Name>More</Name>
-                        <Directory>kde-more.directory</Directory>
-                        <Include>
-                                <And>
-                                <Category>Office</Category>
-                                <Category>X-KDE-More</Category>
-                                </And>
-                        </Include>
-                </Menu>
-	</Menu>
-	<Menu>
-		<Name>Settingsmenu</Name>
-		<Directory>kde-settingsmenu.directory</Directory>
-		<Include>
-			<Category>Settings</Category>
-		</Include>
-	</Menu>
-	<Menu>
-		<Name>System</Name>
-		<Directory>kde-system.directory</Directory>
-		<Include>
-			<And>
-			<Category>System</Category>
-			<Not><Category>X-KDE-More</Category></Not>
-			</And>
-		</Include>
-		<Menu>
-			<Name>SuperUser</Name>
-			<Directory>kde-system-su.directory</Directory>
-			<Include>
-				<And>
-				<Category>X-KDE-System-su</Category>
-				<Not><Category>X-KDE-More</Category></Not>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>More</Name>
-			<Directory>kde-more.directory</Directory>
-			<Include>
-				<And>
-				<Category>System</Category>
-				<Category>X-KDE-More</Category>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>ScreenSavers</Name>
-			<Directory>kde-system-screensavers.directory</Directory>
-		</Menu>
-		<Menu>
-			<Name>Terminal</Name>
-			<Directory>kde-system-terminal.directory</Directory>
-		</Menu>
-	</Menu>
-	<Menu>
-		<Name>Utilities</Name>
-		<Directory>kde-utilities.directory</Directory>
-		<Include>
-                      <And>
-			<Or>
-			<Category>Utility</Category>
-                        <Category>TextEditor</Category>
-                        <Category>X-KDE-Utilities-File</Category>
-			<Category>X-KDE-Utilities-Desktop</Category>
-			<Category>X-KDE-Utilities-Peripherals</Category>
-			<Category>X-KDE-Utilities-PIM</Category>
-			<Category>Accessibility</Category>
-			</Or>
-			<Not><Category>X-KDE-More</Category></Not>
-                     </And>
-		</Include>
-		<Menu>
-			<Name>XUtilities</Name>
-			<Directory>kde-utilities-xutils.directory</Directory>
-		</Menu>
-		<Menu>
-			<Name>More</Name>
-			<Directory>kde-more.directory</Directory>
-			<Include>
-				<And>
-				<Category>Utility</Category>
-				<Category>X-KDE-More</Category>
-				</And>
-			</Include>
-		</Menu>
-	</Menu>
-	<Include>
-		<And>
-		<Category>KDE</Category>
-		<Category>Core</Category>
-		</And>
-	</Include>
-	<DefaultMergeDirs/>
+  <Menu>
+    <Name>Applications</Name>
+    <Directory>kde-unknown.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Not>
+        <!-- Don't list non-KDE core applications -->
+        <And>
+          <Category>Core</Category>
+          <Not><Category>KDE</Category></Not>
+        </And>
+        <!-- Don't list SUSE's YaST in here -->
+        <Category>X-SuSE-YaST</Category>
+      </Not>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Development</Name>
+    <Directory>kde-development.directory</Directory>
+    <Menu>
+      <Name>X-KDE-KDevelopIDE</Name>
+      <Directory>kde-development-tdevelop.directory</Directory>
+      <Include>
+        <And>
+        <Category>Development</Category>
+        <Category>X-KDE-KDevelopIDE</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Translation</Name>
+      <Directory>kde-development-translation.directory</Directory>
+      <Include>
+        <And>
+        <Category>Development</Category>
+        <Category>Translation</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Web Development</Name>
+      <Directory>kde-development-webdevelopment.directory</Directory>
+      <Include>
+        <And>
+        <Category>Development</Category>
+        <Category>WebDevelopment</Category>
+        </And>
+      </Include>
+    </Menu>
+      <Include>
+        <And>
+        <Category>Development</Category>
+        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
+        <Not><Category>Translation</Category></Not>
+        <Not><Category>WebDevelopment</Category></Not>
+        </And>
+      </Include>
+  </Menu>
+  <Menu>
+    <Name>Science</Name>
+    <Directory>kde-science.directory</Directory>
+    <Include>
+      <And><!-- Include /any/ Science app which is not an Education app -->
+        <Or>
+          <Category>Astronomy</Category>
+          <Category>Biology</Category>
+          <Category>Chemistry</Category>
+          <Category>Geology</Category>
+          <Category>MedicalSoftware</Category>
+          <Category>Physics</Category>
+          <Category>Math</Category>
+          <Category>Science</Category>
+        </Or>
+        <Not><Category>Education</Category></Not>
+      </And>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Edutainment</Name>
+    <Directory>kde-edutainment.directory</Directory>
+    <Menu>
+      <Name>Languages</Name>
+      <Directory>kde-edu-languages.directory</Directory>
+      <Include>
+        <And>
+        <Category>Education</Category>
+        <Or>
+        <Category>Languages</Category>
+        <Category>X-KDE-Edu-Language</Category>
+        </Or>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Mathematics</Name>
+      <Directory>kde-edu-mathematics.directory</Directory>
+      <Include>
+        <And>
+        <Category>Education</Category>
+        <Category>Math</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Miscellaneous</Name>
+      <Directory>kde-edu-miscellaneous.directory</Directory>
+      <Include>
+        <And>
+        <Category>Education</Category>
+        <Not>
+        <Category>Languages</Category>
+        <Category>X-KDE-Edu-Language</Category>
+        <Category>Math</Category>
+        <Category>Science</Category>
+        <Category>Teaching</Category>
+        <Category>X-KDE-Edu-Teaching</Category>
+        </Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Science</Name>
+      <Directory>kde-edu-science.directory</Directory>
+      <Include>
+        <And>
+        <Category>Education</Category>
+        <Category>Science</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Tools</Name>
+      <Directory>kde-edu-tools.directory</Directory>
+      <Include>
+        <And>
+        <Category>Education</Category>
+        <Or>
+        <Category>Teaching</Category>
+        <Category>X-KDE-Edu-Teaching</Category>
+        </Or>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Games</Name>
+    <Directory>kde-games.directory</Directory>
+    <Menu>
+      <Name>Arcade</Name>
+      <Directory>kde-games-arcade.directory</Directory>
+      <Include>
+        <And>
+        <Category>Game</Category>
+        <Category>ArcadeGame</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Board</Name>
+      <Directory>kde-games-board.directory</Directory>
+      <Include>
+        <And>
+        <Category>Game</Category>
+        <Category>BoardGame</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Card</Name>
+      <Directory>kde-games-card.directory</Directory>
+      <Include>
+        <And>
+        <Category>Game</Category>
+        <Category>CardGame</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Kidsgames</Name>
+      <Directory>kde-games-kids.directory</Directory>
+      <Include>
+        <And>
+        <Category>Game</Category>
+        <Or>
+        <Category>X-KDE-KidsGame</Category>
+        <Category>KidsGame</Category>
+        </Or>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>TacticStrategy</Name>
+      <Directory>kde-games-strategy.directory</Directory>
+      <Include>
+        <And>
+        <Category>Game</Category>
+        <Category>StrategyGame</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Include>
+      <And>
+      <Category>Game</Category>
+      <Not>
+      <Category>ArcadeGame</Category>
+      <Category>BoardGame</Category>
+      <Category>CardGame</Category>
+      <Category>X-KDE-KidsGame</Category>
+      <Category>KidsGame</Category>
+      <Category>StrategyGame</Category>
+      </Not>
+      </And>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Graphics</Name>
+    <Directory>kde-graphics.directory</Directory>
+    <Include>
+      <And>
+      <Category>Graphics</Category>
+      <Not><Category>X-KDE-More</Category></Not>
+      <Not><Filename>ooo-draw.desktop</Filename></Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>More</Name>
+      <Directory>kde-more.directory</Directory>
+      <Include>
+        <And>
+        <Category>Graphics</Category>
+        <Category>X-KDE-More</Category>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Internet</Name>
+    <Directory>kde-internet.directory</Directory>
+    <Include>
+      <And>
+      <Category>Network</Category>
+      <Not><Category>X-KDE-More</Category></Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>Terminal</Name>
+      <Directory>kde-internet-terminal.directory</Directory>
+    </Menu>
+    <Menu>
+      <Name>More</Name>
+      <Directory>kde-more.directory</Directory>
+      <Include>
+        <And>
+        <Category>Network</Category>
+        <Category>X-KDE-More</Category>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Multimedia</Name>
+    <Directory>kde-multimedia.directory</Directory>
+    <Include>
+      <And>
+      <Category>AudioVideo</Category>
+      <Not><Category>X-KDE-More</Category></Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>More</Name>
+      <Directory>kde-more.directory</Directory>
+      <Include>
+        <And>
+        <Category>AudioVideo</Category>
+        <Category>X-KDE-More</Category>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Office</Name>
+    <Directory>kde-office.directory</Directory>
+    <Layout>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+      <Separator/>
+      <Menuname>More</Menuname>
+    </Layout>
+    <Include>
+      <And>
+      <Category>Office</Category>
+        <Not><Category>X-KDE-More</Category></Not>
+      </And>
+    <Filename>ooo-draw.desktop</Filename>
+    </Include>
+    <Menu>
+      <Name>More</Name>
+      <Directory>kde-more.directory</Directory>
+      <Include>
+        <And>
+          <Category>Office</Category>
+          <Category>X-KDE-More</Category>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Settingsmenu</Name>
+    <Directory>kde-settingsmenu.directory</Directory>
+    <Include>
+      <Category>Settings</Category>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>System</Name>
+    <Directory>kde-system.directory</Directory>
+    <Include>
+      <And>
+      <Category>System</Category>
+      <Not><Category>X-KDE-More</Category></Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>SuperUser</Name>
+      <Directory>kde-system-su.directory</Directory>
+      <Include>
+        <And>
+        <Category>X-KDE-System-su</Category>
+        <Not><Category>X-KDE-More</Category></Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>More</Name>
+      <Directory>kde-more.directory</Directory>
+      <Include>
+        <And>
+        <Category>System</Category>
+        <Category>X-KDE-More</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>ScreenSavers</Name>
+      <Directory>kde-system-screensavers.directory</Directory>
+    </Menu>
+    <Menu>
+      <Name>Terminal</Name>
+      <Directory>kde-system-terminal.directory</Directory>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Utilities</Name>
+    <Directory>kde-utilities.directory</Directory>
+    <Include>
+      <And>
+      <Category>Utility</Category>
+      <Not><Category>Accessibility</Category></Not>
+      <Not><Category>X-KDE-Utilities-Desktop</Category></Not>
+      <Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
+      <Not><Category>X-KDE-Utilities-PIM</Category></Not>
+      <Not><Category>X-KDE-More</Category></Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>Accessibility</Name>
+      <Directory>kde-utilities-accessibility.directory</Directory>
+      <Include>
+        <And>
+        <Category>Utility</Category>
+        <Category>Accessibility</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Desktop</Name>
+      <Directory>kde-utilities-desktop.directory</Directory>
+      <Include>
+        <And>
+        <Category>Utility</Category>
+        <Category>X-KDE-Utilities-Desktop</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Editors</Name>
+      <Directory>kde-editors.directory</Directory>
+      <Include>
+        <Category>TextEditor</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>PIM</Name>
+      <Directory>kde-utilities-pim.directory</Directory>
+      <Include>
+        <And>
+        <Category>Utility</Category>
+        <Category>X-KDE-Utilities-PIM</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Toys</Name>
+      <Directory>kde-toys.directory</Directory>
+      <Include>
+        <Category>Amusement</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>XUtilities</Name>
+      <Directory>kde-utilities-xutils.directory</Directory>
+    </Menu>
+    <Menu>
+      <Name>More</Name>
+      <Directory>kde-more.directory</Directory>
+      <Include>
+        <And>
+        <Category>Utility</Category>
+        <Category>X-KDE-More</Category>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>More</Name>
+      <Directory>kde-more.directory</Directory>
+      <Include>
+        <And>
+        <Category>Utility</Category>
+        <Category>X-KDE-More</Category>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Include>
+    <And>
+    <Category>KDE</Category>
+    <Category>Core</Category>
+    </And>
+  </Include>
+  <DefaultMergeDirs/>
 
-	<Menu>
-		<Name>Debian</Name>
-		<Directory>debian.directory</Directory>
-		<MergeFile>debian-menu.menu</MergeFile>
-	</Menu>
+  <Menu>
+    <Name>Debian</Name>
+    <Directory>debian.directory</Directory>
+    <MergeFile>debian-menu.menu</MergeFile>
+  </Menu>
 
-	<MergeDir>applications-merged</MergeDir>
-	<MergeFile>applications-kmenuedit.menu</MergeFile>
+  <MergeDir>applications-merged</MergeDir>
+  <MergeFile>applications-kmenuedit.menu</MergeFile>
 </Menu>
-- 
cgit v1.2.1