Break out default options into modules, create extend-options module