Update Color changes and bugfixing