art: tiles with extras
Merge branch 'refs/heads/art'