--- a/files/etc/xdg/menus/cinnamon-applications.menu +++ b/files/etc/xdg/menus/cinnamon-applications.menu @@ -4,12 +4,12 @@ <Menu> <Name>Applications</Name> - <Directory>cinnamon-menu-applications.directory</Directory> + <Directory>X-GNOME-Menu-Applications.directory</Directory> <!-- Scan legacy dirs first, as later items take priority --> <KDELegacyDirs/> <LegacyDir>/etc/X11/applnk</LegacyDir> - <LegacyDir>/usr/share/cinnamon/apps</LegacyDir> + <LegacyDir>/usr/share/gnome/apps</LegacyDir> <!-- Read standard .directory and .desktop file locations --> <DefaultAppDirs/> @@ -21,7 +21,7 @@ <!-- Accessories submenu --> <Menu> <Name>Accessories</Name> - <Directory>cinnamon-utility.directory</Directory> + <Directory>Utility.directory</Directory> <Include> <And> <Category>Utility</Category> @@ -38,7 +38,7 @@ <!-- Accessibility submenu --> <Menu> <Name>Universal Access</Name> - <Directory>cinnamon-utility-accessibility.directory</Directory> + <Directory>Utility-Accessibility.directory</Directory> <Include> <And> <Category>Accessibility</Category> @@ -50,7 +50,7 @@ <!-- Development Tools --> <Menu> <Name>Development</Name> - <Directory>cinnamon-development.directory</Directory> + <Directory>Development.directory</Directory> <Include> <And> <Category>Development</Category> @@ -62,7 +62,7 @@ <!-- Education --> <Menu> <Name>Education</Name> - <Directory>cinnamon-education.directory</Directory> + <Directory>Education.directory</Directory> <Include> <And> <Category>Education</Category> @@ -73,7 +73,7 @@ <!-- Games --> <Menu> <Name>Games</Name> - <Directory>cinnamon-game.directory</Directory> + <Directory>Game.directory</Directory> <Include> <And> <Category>Game</Category> @@ -84,7 +84,7 @@ <!-- Graphics --> <Menu> <Name>Graphics</Name> - <Directory>cinnamon-graphics.directory</Directory> + <Directory>Graphics.directory</Directory> <Include> <And> <Category>Graphics</Category> @@ -95,7 +95,7 @@ <!-- Internet --> <Menu> <Name>Internet</Name> - <Directory>cinnamon-network.directory</Directory> + <Directory>Network.directory</Directory> <Include> <And> <Category>Network</Category> @@ -106,7 +106,7 @@ <!-- Multimedia --> <Menu> <Name>Multimedia</Name> - <Directory>cinnamon-audio-video.directory</Directory> + <Directory>AudioVideo.directory</Directory> <Include> <And> <Category>AudioVideo</Category> @@ -117,7 +117,7 @@ <!-- Office --> <Menu> <Name>Office</Name> - <Directory>cinnamon-office.directory</Directory> + <Directory>Office.directory</Directory> <Include> <And> <Category>Office</Category> @@ -128,7 +128,7 @@ <!-- System Tools--> <Menu> <Name>System</Name> - <Directory>cinnamon-system-tools.directory</Directory> + <Directory>System-Tools.directory</Directory> <Include> <And> <Category>System</Category> @@ -140,13 +140,15 @@ <!-- Other --> <Menu> <Name>Other</Name> - <Directory>cinnamon-other.directory</Directory> + <Directory>X-GNOME-Other.directory</Directory> <OnlyUnallocated/> <Include> <And> <Not><Category>Core</Category></Not> <Not><Category>Settings</Category></Not> <Not><Category>Screensaver</Category></Not> + <Not><Category>X-GNOME-Settings-Panel</Category></Not> + <Not><Category>Documentation</Category></Not> </And> </Include> </Menu> <!-- End Other --> @@ -154,10 +156,10 @@ <!-- Wine --> <Menu> <Name>Wine</Name> - <Directory>wine-wine.directory</Directory> + <Directory>Wine.directory</Directory> <Include> <And> - <Category>Wine</Category> + <Category>X-Wine</Category> </And> </Include> </Menu> <!-- End Wine --> --- a/files/etc/xdg/menus/cinnamon-settings.menu +++ b/files/etc/xdg/menus/cinnamon-settings.menu @@ -18,9 +18,14 @@ <Name>Preferences</Name> <Directory>cinnamon-settings.directory</Directory> <Include> - <And> - <Category>Settings</Category> - </And> + <And> + <Category>Settings</Category> + <Not> + <Or> + <Category>System</Category> + </Or> + </Not> + </And> </Include> </Menu>