Add templates for missing configuration options to the x11drv section.
Remove obsolete command-line options.