Work on smoothing theme transitions