Better theme handling.