Make the diff display less gaudy.

The old style is still available as an option (we still need a
preferences window so we can set/clear it though).