Added vignette and greyscale

Also cleaned up the code a little