finish first pass at image plugin conversion