Flip order of style concat.  Change enabling var to be called enabled.
Support new draw option