Updated Options

Added toggle-able Options.