Settings are now completed

Sorry for the second pull request. I am new to git.

I now added all things I saw to the settings file. And merged it to the master of my fork. 
I think it is easier to merge my master to your master than first patch-1 and then master.

Christian