Moving options to skins/option-types