Fixes for minified version also now supports color