use new html tags, closes #41