Use lighter green in diffs
Use simpler package-archives def, remove ELPA