Revamping theme options to work with customizer screen