Updated widget option handling