icons, structured items, and more
Merge branch 'master' into gh-pages