Better theme handling...