Modify config options to use one option for the url mode - Closes #84

* Still requires removal of deprecated functions