Revamp config. Need to organise into multiple .el files.