More re-arranging of theme options. Yup.