Rewrite artwork support to use artwork.h