correct theme handling