re-tweak option classes