Sensible renaming and a few new presets.