added theme selection and dressed it up more