Cheats and keys update

This replaces #1903 - I've always had trouble fixing merge conflicts so it's easier just to create a new branch.