Merged existing markups to new theme.