Improved theme options