Updated default config and fixed Custom Config