New colors and fix to JS code