Fixed Arches consistent names and a little bit more.
Merge branch 'development' of https://github.com/serengeor/And-they-shall-know-no-fear into development
Minor changes, like the smell of your dirty socks since yesterday.