Better theme activation logic