Convert all options to use the fancy new extension
Fix a config reference table heading
Add some comments