Updated generator options for modified shortcodes. (#3, #4)