Additional fixes for menu application.

etc/xdg/lubuntu/menus/lxde-applications.menu

@@ -117,61 +117,45 @@
         </Include>
     </Menu>
 
-<!-- Preferences Menu, to include in Layout section -->
+<!-- Administration Menu, to include in Layout section -->
     <Menu>
-        <Name>DesktopSettings</Name>
-        <Directory>lxde-settings.directory</Directory>
-        <OnlyUnallocated/>
+        <Name>Administration</Name>
+        <Directory>lxde-system-tools.directory</Directory>
         <Include>
-            <Or>
+            <And>
                 <Category>Settings</Category>
-                <Not><Category>PackageManager</Category><Not>
-                <Not><Category>System</Category><Not>
+                <Category>System</Category>
+            </And>
+            <Or>
+                <Category>System</Category>
             </Or>
         </Include>
-        <Layout>
-            <Merge type="menus"/>
-            <Merge type="files"/>
-        </Layout>
     </Menu>
 
-<!-- System Menu, to include in Layout section -->
+<!-- Preferences Menu, to include in Layout section -->
     <Menu>
-        <Name>System</Name>
-        <Directory>lxde-system-tools.directory</Directory>
-        <OnlyUnallocated/>
+        <Name>DesktopSettings</Name>
+        <Directory>lxde-settings.directory</Directory>
         <Include>
-            <Or>
-                <Category>System</Category>
-                <Category>PackageManager</Category>
-                <Not><Category>Settings</Category></Not>
-            </Or>
+            <And>
+                <Category>Settings</Category>
+                <Not>
+                    <Or>
+                        <Category>System</Category>
+                    </Or>
+                </Not>
+            </And>
         </Include>
-        <Layout>
-            <Merge type="menus"/>
-            <Merge type="files"/>
-        </Layout>
     </Menu>
 
-<!-- Include additional entry in menu -->
-    <Include>
-        <Filename>synaptic.desktop</Filename>
-        <Filename>pcmanfm.desktop</Filename>
-    </Include>
-
 <!-- General layout of the whole menu -->
     <Layout>
         <Menuname>Settings</Menuname>
         <Separator/>
         <Merge type="all"/>
         <Separator/>
-        <Menuname>System</Menuname>
-        <Separator/>
+        <Menuname>Administration</Menuname>
         <Menuname>DesktopSettings</Menuname>
-        <Separator/>
-        <Filename>synaptic.desktop</Filename>
-        <Separator/>
-        <Filename>pcmanfm.desktop</Filename>
     </Layout>
 
 </Menu>