--- gnome-menus-2.20.0/layout/preferences.menu.uncluttermenu	2007-09-17 20:36:13.000000000 +0200
+++ gnome-menus-2.20.0/layout/preferences.menu	2007-09-28 12:20:26.000000000 +0200
@@ -15,14 +15,17 @@
   <!-- Stuff in the toplevel -->
   <Include>
     <And>
+      <Category>GNOME</Category>
       <Category>Settings</Category>
       <Not>
         <Or>
           <Category>System</Category>
           <Category>Accessibility</Category>
+          <Category>X-MandrivaLinux-System-Configuration-GNOME-Advanced</Category>
         </Or>
       </Not>
     </And>
+    <Category>X-MandrivaLinux-System-Configuration-GNOME</Category>
   </Include>
 
   <!-- Menu items to exclude from the toplevel -->
@@ -39,6 +42,17 @@
         <Category>Settings</Category>
         <Category>Accessibility</Category>
       </And>
+      <Category>X-MandrivaLinux-System-Configuration-GNOME-Accessibility</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Advanced</Name>
+    <Directory>mandriva-system-configuration-gnome-advanced.directory</Directory>
+    <Include>
+      <And>
+        <Category>X-MandrivaLinux-System-Configuration-GNOME-Advanced</Category>
+      </And>
     </Include>
   </Menu>
 
--- gnome-menus-2.20.0/layout/settings.menu.uncluttermenu	2007-09-17 20:36:13.000000000 +0200
+++ gnome-menus-2.20.0/layout/settings.menu	2007-09-28 12:23:45.000000000 +0200
@@ -28,11 +28,48 @@
   <Menu>
     <Name>Administration</Name>
     <Directory>System-Settings.directory</Directory>
+      <Layout>
+        <Filename>mandriva-drakconf.desktop</Filename>
+        <Separator/>
+        <Merge type="all"/>
+      </Layout>
+
     <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>System</Category>
-      </And>
+	<And>
+            <!-- never show those, they are in preference menu -->
+            <Not>
+              <Category>GNOME</Category>
+            </Not>
+            <Category>HardwareSettings</Category>
+        </And>
+       <And>
+          <Or>
+            <Or>
+              <Category>GTK</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+            </Or>
+            <Not>
+              <Category>FileTools</Category>
+              <Category>FileSystem</Category>
+              <Category>Security</Category>
+              <Category>Applet</Category>
+              <Category>KDE</Category>
+              <Category>Qt</Category>
+            </Not>
+          </Or>
+          <Or>
+            <And>
+              <Category>System</Category>
+              <Not>
+                <Category>Emulator</Category>
+                <Category>TerminalEmulator</Category>
+              </Not>
+            </And>
+            <Category>Monitor</Category>
+          </Or>
+        </And>
+        <Category>PackageManager</Category>
+        <Category>Printing</Category>
     </Include>
   </Menu>     <!-- End System Settings -->