Complete config revamp