Raster fix and small colour improvements