Fix markup for new styles.