Merge with duke, some layout for the apropos file