theme and server fixes
Merge branch 'development' of https://github.com/serengeor/And-they-shall-know-no-fear into development