Refactoring theme options and shortcode options.