Improved system-dependent override conf files
Improved system-specific override files even more