new colors + fix JS