Added all new colors, although it\'s quite buggy right now
Merge remote-tracking branch 'origin/master'