Second round; mostly file name changes and a few new presets.