Fix #2006 by adding the settings to the cscfg/csdef files

Fixes #2006