Fixed temporary fixes to a more permanent solution. Moved new codelets back into module loader files. All color problems fixed that I can tell