cb-include.cfg refactoring

Much cleaner code :)