Upgraded things!
Reorganized options to Configurator.