fix overlap of old theme and new theme