Further organize KDE Menu.

(cherry picked from commit 955686e61b)

kded/applications.menu

@@ -1,4 +1,4 @@
- <!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>
@@ -233,13 +233,6 @@
       </Not>
       </And>
     </Include>
-               <Menu>
-                        <Name>Toys</Name>
-                        <Directory>kde-toys.directory</Directory>
-                        <Include>
-                                 <Category>Amusement</Category>
-                        </Include>
-               </Menu>
   </Menu>
   <Menu>
     <Name>Graphics</Name>
@@ -383,18 +376,58 @@
     <Directory>kde-utilities.directory</Directory>
     <Include>
       <And>
-			<Or>
       <Category>Utility</Category>
-                        <Category>TextEditor</Category>
-                        <Category>X-KDE-Utilities-File</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>
-			<Category>X-KDE-Utilities-Peripherals</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>
-			<Category>Accessibility</Category>
-			</Or>
-			<Not><Category>X-KDE-More</Category></Not>
         </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>
@@ -409,6 +442,16 @@
         </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>