more support for different theme options