theme and markup changes