A bunch of upgrade to fix issue on color and better Sugarizer integration