Big update

new colors, many improvements