More fussing with theme options