41c41,43
<     <style id="category" _name="Category" map-to="def:floating-point"/>
---
>     <style id="category-main" _name="Main Category" map-to="xml:tags"/>
>     <style id="category-additional" _name="Additional Category" map-to="xml:attribute-name"/>
>     <style id="category-reserved" _name="Reserved Category" map-to="def:error"/>
125c127,142
<         <context style-ref="category">
---
>         <context style-ref="category-main">
>           <keyword>AudioVideo</keyword>
>           <keyword>Audio</keyword>
>           <keyword>Video</keyword>
>           <keyword>Shell</keyword>
>           <keyword>Development</keyword>
>           <keyword>Education</keyword>
>           <keyword>Game</keyword>
>           <keyword>Graphics</keyword>
>           <keyword>Network</keyword>
>           <keyword>Office</keyword>
>           <keyword>Settings</keyword>
>           <keyword>System</keyword>
>           <keyword>Utility</keyword>
>         </context>
>         <context style-ref="category-additional">
132d148
<           <keyword>Applet</keyword>
138d153
<           <keyword>Audio</keyword>
140d154
<           <keyword>AudioVideo</keyword>
162d175
<           <keyword>Development</keyword>
168d180
<           <keyword>Education</keyword>
180d191
<           <keyword>Game</keyword>
185d195
<           <keyword>Graphics</keyword>
208d217
<           <keyword>Network</keyword>
212d220
<           <keyword>Office</keyword>
234d241
<           <keyword>Screensaver</keyword>
237,238d243
<           <keyword>Settings</keyword>
<           <keyword>Shell</keyword>
244d248
<           <keyword>System</keyword>
251d254
<           <keyword>TrayIcon</keyword>
254d256
<           <keyword>Utility</keyword>
257d258
<           <keyword>Video</keyword>
262a264,269
>         <context style-ref="category-reserved">
>           <keyword>Screensaver</keyword>
>           <keyword>TrayIcon</keyword>
>           <keyword>Applet</keyword>
>           <keyword>Shell</keyword>
>         </context>