Cleaned and fixed custom config