More theme related changes.