Fix handling of default options

The previous approach overwrote all the options with the ones from the `DEFAULT_OPTIONS` dictionary. Reverse this, so that the options passed in overwrite the default ones.