Merge OC files from Christopher83 and custom config