Merge in theme2.0 changes