master: added application settings
settings needed to be renamed