numerous changes to themes