Modularised settings file, fixed graditton