Added additional normalise options.
Remove vintage mode again.