Change colors and add a menu tab
Merge remote-tracking branch 'origin/master'