slight structure change and moved theme selection and options to config.less