--- a/pages.xml
+++ b/pages.xml
@@ -1,35 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <pages xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include parse="xml" href="pages/home.xml" />
-  <xi:include parse="xml" href="pages/news.xml" />
+  <menuitem id="home"><xi:include parse="xml" href="pages/home.xml" /></menuitem>
+  <menuitem id="news"><xi:include parse="xml" href="pages/news.xml" /></menuitem>
   <!-- <xi:include parse="xml" href="pages/test.xml" /> -->
 
-  <xi:include parse="xml" href="pages/about.xml" />
-  <xi:include parse="xml" href="pages/features.xml" />
-  <page title="Authors" category="about" id="authors">
-    <pre id="content" xmlns="http://www.w3.org/1999/xhtml"
-	 ><xi:include parse="text" href="misc/AUTHORS" /></pre>
-  </page>
+  <menuitem id="about">
+    <xi:include parse="xml" href="pages/about.xml" />
+    <menugroup category="about">
+      <menuitem id="features"><xi:include parse="xml" href="pages/features.xml" /></menuitem>
+      <menuitem id="authors">
+        <page title="Authors" id="authors" category="about">
+          <pre id="content" xmlns="http://www.w3.org/1999/xhtml"><xi:include parse="text" href="misc/AUTHORS" /></pre>
+        </page>
+      </menuitem>
+    </menugroup>
+  </menuitem>
 
-  <xi:include parse="xml" href="pages/faq.xml" />
-  <xi:include parse="xml" href="pages/links.xml" />
+  <menuitem id="faq"><xi:include parse="xml" href="pages/faq.xml" /></menuitem>
+  <menuitem id="links"><xi:include parse="xml" href="pages/links.xml" /></menuitem>
 
-  <xi:include parse="xml" href="pages/releases.xml" />
+  <menuitem id="releases"><xi:include parse="xml" href="pages/releases.xml" /></menuitem>
 
-  <xi:include parse="xml" href="pages/developer.xml" />
-  <xi:include parse="xml" href="pages/hackersguide.xml" />
-  <xi:include parse="xml" href="pages/repository.xml" />
-  <xi:include parse="xml" href="pages/bindings.xml" />
-  <xi:include parse="xml" href="pages/samplecode.xml" />
+  <menuitem id="developer">
+    <xi:include parse="xml" href="pages/developer.xml" />
+    <menugroup category="developer">
+      <menuitem id="hackersguide"><xi:include parse="xml" href="pages/hackersguide.xml" /></menuitem>
+      <menuitem id="repository"><xi:include parse="xml" href="pages/repository.xml" /></menuitem>
+      <menuitem id="bindings"><xi:include parse="xml" href="pages/bindings.xml" /></menuitem>
+      <menuitem id="samplecode"><xi:include parse="xml" href="pages/samplecode.xml" /></menuitem>
+    </menugroup>
+  </menuitem>
 
-  <xi:include parse="xml" href="pages/qa.xml" />
-  <link title="Bug Tracker" src="http://bugs.xine-project.org/" category="qa" />
-  <xi:include parse="xml" href="pages/security.xml" />
+  <menuitem id="qa">
+    <xi:include parse="xml" href="pages/qa.xml" />
+    <menugroup category="qa">
+      <menuitem><link title="Bug Tracker" src="http://bugs.xine-project.org/" category="qa" /></menuitem>
+      <menuitem id="security"><xi:include parse="xml" href="pages/security.xml" /></menuitem>
+    </menugroup>
+  </menuitem>
 
-  <xi:include parse="xml" href="pages/donations.xml" />
+  <menuitem id="donations"><xi:include parse="xml" href="pages/donations.xml" /></menuitem>
 
-  <link title="Mailing Lists" src="http://sourceforge.net/mail/?group_id=9655" />
-  <link title="Freshmeat Page" src="http://freshmeat.net/projects/xine" />
-  <link title="SF Project Page" src="http://sourceforge.net/projects/xine" />
-  <link title="Alioth Project Page" src="http://xine-lib.alioth.debian.org/" />
+  <menuitem><link title="Mailing Lists" src="http://sourceforge.net/mail/?group_id=9655" /></menuitem>
+  <menuitem><link title="Freshmeat Page" src="http://freshmeat.net/projects/xine" /></menuitem>
+  <menuitem><link title="SF Project Page" src="http://sourceforge.net/projects/xine" /></menuitem>
+  <menuitem><link title="Alioth Project Page" src="http://xine-lib.alioth.debian.org/" /></menuitem>
 </pages>