Commit changes that fixes several issues and more closely integrates
Enigma Settings with Game Settings.