Added keys to all settings. Closes #376