Started re-arranging theme options
Re-arranging more of the theme options