Better theme support.