Adds config for custom options
Fixes merge conflicts
JS naming for custom_options
Merge branch 'adds-more-config'