Partial conversion of images to use rasters
Dropping target to JDK 1.6